From f2c51a0fa1771b5381cc1f0fa7bd8946632c94e2 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Thu, 18 Feb 2021 19:26:03 +0600 Subject: [PATCH] clippy warnings --- ntex/src/http/client/sender.rs | 12 ++++++------ ntex/src/web/response.rs | 6 +++--- ntex/src/web/types/payload.rs | 2 +- ntex/src/ws/proto.rs | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ntex/src/http/client/sender.rs b/ntex/src/http/client/sender.rs index fcc638f1..01290349 100644 --- a/ntex/src/http/client/sender.rs +++ b/ntex/src/http/client/sender.rs @@ -31,18 +31,18 @@ pub(crate) enum PrepForSendingError { Http(HttpError), } -impl Into for PrepForSendingError { - fn into(self) -> FreezeRequestError { - match self { +impl From for FreezeRequestError { + fn from(err: PrepForSendingError) -> FreezeRequestError { + match err { PrepForSendingError::Url(e) => FreezeRequestError::Url(e), PrepForSendingError::Http(e) => FreezeRequestError::Http(e), } } } -impl Into for PrepForSendingError { - fn into(self) -> SendRequestError { - match self { +impl From for SendRequestError { + fn from(err: PrepForSendingError) -> SendRequestError { + match err { PrepForSendingError::Url(e) => SendRequestError::Url(e), PrepForSendingError::Http(e) => SendRequestError::Http(e), } diff --git a/ntex/src/web/response.rs b/ntex/src/web/response.rs index 08eb043a..fd03326a 100644 --- a/ntex/src/web/response.rs +++ b/ntex/src/web/response.rs @@ -125,9 +125,9 @@ impl WebResponse { } } -impl Into> for WebResponse { - fn into(self) -> Response { - self.response +impl From for Response { + fn from(res: WebResponse) -> Response { + res.response } } diff --git a/ntex/src/web/types/payload.rs b/ntex/src/web/types/payload.rs index 2b2f4d9d..84ff9cb3 100644 --- a/ntex/src/web/types/payload.rs +++ b/ntex/src/web/types/payload.rs @@ -156,7 +156,7 @@ impl FromRequest for Bytes { let limit = cfg.limit; let fut = HttpMessageBody::new(req, payload).limit(limit); - Either::Left(async move { Ok(fut.await?) }.boxed_local()) + Either::Left(async move { fut.await }.boxed_local()) } } diff --git a/ntex/src/ws/proto.rs b/ntex/src/ws/proto.rs index 028663d6..126792e0 100644 --- a/ntex/src/ws/proto.rs +++ b/ntex/src/ws/proto.rs @@ -35,9 +35,9 @@ impl fmt::Display for OpCode { } } -impl Into for OpCode { - fn into(self) -> u8 { - match self { +impl From for u8 { + fn from(code: OpCode) -> u8 { + match code { Continue => 0, Text => 1, Binary => 2, @@ -132,9 +132,9 @@ pub enum CloseCode { Other(u16), } -impl Into for CloseCode { - fn into(self) -> u16 { - match self { +impl From for u16 { + fn from(code: CloseCode) -> u16 { + match code { Normal => 1000, Away => 1001, Protocol => 1002,