From 72cc69ab954524dcdf3860b64204fe6d550d2f23 Mon Sep 17 00:00:00 2001 From: Juan Aguilar Date: Tue, 22 Dec 2020 17:56:09 +0100 Subject: [PATCH] Fix clippy and minor issues (#32) * Fix clippy and minor issues * Remove allow clippy attribute * Reduce RequestHeader flags visibility --- ntex/src/http/body.rs | 13 +++++-------- ntex/src/http/client/ws.rs | 20 +++++++++++--------- ntex/src/http/config.rs | 2 +- ntex/src/http/message.rs | 2 +- ntex/src/http/response.rs | 15 +++++++-------- ntex/src/util/buffer.rs | 2 +- ntex/src/util/inflight.rs | 2 +- ntex/src/web/middleware/compress.rs | 5 +---- 8 files changed, 28 insertions(+), 33 deletions(-) diff --git a/ntex/src/http/body.rs b/ntex/src/http/body.rs index d91a77f8..af70b6b1 100644 --- a/ntex/src/http/body.rs +++ b/ntex/src/http/body.rs @@ -187,14 +187,11 @@ impl MessageBody for Body { impl PartialEq for Body { fn eq(&self, other: &Body) -> bool { - match *self { - Body::None => matches!(*other, Body::None), - Body::Empty => matches!(*other, Body::Empty), - Body::Bytes(ref b) => match *other { - Body::Bytes(ref b2) => b == b2, - _ => false, - }, - Body::Message(_) => false, + match (self, other) { + (Body::None, Body::None) => true, + (Body::Empty, Body::Empty) => true, + (Body::Bytes(ref b), Body::Bytes(ref b2)) => b == b2, + _ => false, } } } diff --git a/ntex/src/http/client/ws.rs b/ntex/src/http/client/ws.rs index 4d517050..30151168 100644 --- a/ntex/src/http/client/ws.rs +++ b/ntex/src/http/client/ws.rs @@ -11,8 +11,7 @@ use futures::Stream; use crate::codec::{AsyncRead, AsyncWrite, Framed}; use crate::http::error::HttpError; use crate::http::header::{self, HeaderName, HeaderValue, AUTHORIZATION}; -use crate::http::{ConnectionType, StatusCode, Uri}; -use crate::http::{Payload, RequestHead}; +use crate::http::{ConnectionType, Payload, RequestHead, StatusCode, Uri}; use crate::rt::time::timeout; use crate::service::{IntoService, Service}; use crate::util::framed::{Dispatcher, DispatcherError}; @@ -46,13 +45,16 @@ impl WebsocketsRequest { Uri: TryFrom, >::Error: Into, { - let mut err = None; - let mut head = RequestHead::default(); - - match Uri::try_from(uri) { - Ok(uri) => head.uri = uri, - Err(e) => err = Some(e.into()), - } + let (head, err) = match Uri::try_from(uri) { + Ok(uri) => ( + RequestHead { + uri, + ..Default::default() + }, + None, + ), + Err(e) => (Default::default(), Some(e.into())), + }; WebsocketsRequest { head, diff --git a/ntex/src/http/config.rs b/ntex/src/http/config.rs index a8bc2e14..ff3f5a18 100644 --- a/ntex/src/http/config.rs +++ b/ntex/src/http/config.rs @@ -125,7 +125,7 @@ impl DispatcherConfig { } } - /// Return state of connection keep-alive funcitonality + /// Return state of connection keep-alive functionality pub(super) fn keep_alive_enabled(&self) -> bool { self.ka_enabled } diff --git a/ntex/src/http/message.rs b/ntex/src/http/message.rs index 048bf2a8..1610f311 100644 --- a/ntex/src/http/message.rs +++ b/ntex/src/http/message.rs @@ -44,7 +44,7 @@ pub struct RequestHead { pub headers: HeaderMap, pub extensions: RefCell, pub peer_addr: Option, - flags: Flags, + pub(super) flags: Flags, } impl Default for RequestHead { diff --git a/ntex/src/http/response.rs b/ntex/src/http/response.rs index 9a0fd1a5..64312270 100644 --- a/ntex/src/http/response.rs +++ b/ntex/src/http/response.rs @@ -334,9 +334,9 @@ impl ResponseBuilder { Ok(value) => { parts.headers.append(key, value); } - Err(e) => self.err = log_error(e), + Err(e) => self.err = Some(log_error(e)), }, - Err(e) => self.err = log_error(e), + Err(e) => self.err = Some(log_error(e)), }; } self @@ -367,9 +367,9 @@ impl ResponseBuilder { Ok(value) => { parts.headers.insert(key, value); } - Err(e) => self.err = log_error(e), + Err(e) => self.err = Some(log_error(e)), }, - Err(e) => self.err = log_error(e), + Err(e) => self.err = Some(log_error(e)), }; } self @@ -436,7 +436,7 @@ impl ResponseBuilder { Ok(value) => { parts.headers.insert(header::CONTENT_TYPE, value); } - Err(e) => self.err = log_error(e), + Err(e) => self.err = Some(log_error(e)), }; } self @@ -741,11 +741,10 @@ impl fmt::Debug for ResponseBuilder { } } -#[allow(clippy::unnecessary_wraps)] -fn log_error>(err: T) -> Option { +fn log_error>(err: T) -> HttpError { let e = err.into(); error!("Error in ResponseBuilder {}", e); - Some(e) + e } /// Helper converters diff --git a/ntex/src/util/buffer.rs b/ntex/src/util/buffer.rs index 687ed326..5b51e95c 100644 --- a/ntex/src/util/buffer.rs +++ b/ntex/src/util/buffer.rs @@ -145,7 +145,7 @@ where inner.waker.register(cx.waker()); let mut buffer = inner.buf.borrow_mut(); - if let Poll::Pending = inner.service.poll_ready(cx)? { + if inner.service.poll_ready(cx)?.is_pending() { if buffer.len() < self.size { // buffer next request inner.ready.set(false); diff --git a/ntex/src/util/inflight.rs b/ntex/src/util/inflight.rs index ff1874f6..e39495c5 100644 --- a/ntex/src/util/inflight.rs +++ b/ntex/src/util/inflight.rs @@ -77,7 +77,7 @@ where #[inline] fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - if let Poll::Pending = self.service.poll_ready(cx)? { + if self.service.poll_ready(cx)?.is_pending() { Poll::Pending } else if !self.count.available(cx) { log::trace!("InFlight limit exceeded"); diff --git a/ntex/src/web/middleware/compress.rs b/ntex/src/web/middleware/compress.rs index b1bba4ad..0c2a4c88 100644 --- a/ntex/src/web/middleware/compress.rs +++ b/ntex/src/web/middleware/compress.rs @@ -197,10 +197,7 @@ impl AcceptEncoding { }; let quality = match parts.len() { 1 => encoding.quality(), - _ => match f64::from_str(parts[1]) { - Ok(q) => q, - Err(_) => 0.0, - }, + _ => f64::from_str(parts[1]).unwrap_or(0.0), }; Some(AcceptEncoding { encoding, quality }) }