From 1e2bc4a9e25ead0be179fd456b0648a59fd3b340 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 22 Dec 2020 19:55:06 +0600 Subject: [PATCH] clippy --- ntex-router/src/quoter.rs | 6 ++-- ntex-router/src/resource.rs | 13 +++---- ntex-router/src/tree.rs | 15 ++++---- ntex-rt/src/arbiter.rs | 5 +-- ntex-rt/src/builder.rs | 5 ++- ntex/src/http/body.rs | 15 ++------ ntex/src/http/client/h2proto.rs | 8 ++--- ntex/src/http/client/pool.rs | 4 +-- ntex/src/http/client/sender.rs | 2 +- ntex/src/http/client/ws.rs | 4 +-- ntex/src/http/h1/dispatcher.rs | 62 +++++++++++++++------------------ ntex/src/http/header/mod.rs | 5 +-- ntex/src/http/response.rs | 1 + ntex/src/server/config.rs | 6 ++-- ntex/src/web/types/payload.rs | 9 ++--- 15 files changed, 66 insertions(+), 94 deletions(-) diff --git a/ntex-router/src/quoter.rs b/ntex-router/src/quoter.rs index 7bdd87fc..5cf3541f 100644 --- a/ntex-router/src/quoter.rs +++ b/ntex-router/src/quoter.rs @@ -50,11 +50,11 @@ pub(super) fn requote(val: &[u8]) -> Option { #[inline] fn from_hex(v: u8) -> Option { - if v >= b'0' && v <= b'9' { + if (b'0'..=b'9').contains(&v) { Some(v - 0x30) // ord('0') == 0x30 - } else if v >= b'A' && v <= b'F' { + } else if (b'A'..=b'F').contains(&v) { Some(v - 0x41 + 10) // ord('A') == 0x41 - } else if v >= b'a' && v <= b'f' { + } else if (b'a'..=b'f').contains(&v) { Some(v - 0x61 + 10) // ord('a') == 0x61 } else { None diff --git a/ntex-router/src/resource.rs b/ntex-router/src/resource.rs index c9f27502..f5166842 100644 --- a/ntex-router/src/resource.rs +++ b/ntex-router/src/resource.rs @@ -32,17 +32,16 @@ enum PathElement { impl PathElement { fn is_str(&self) -> bool { - match self { - PathElement::Str(_) => true, - _ => false, - } + matches!(self, PathElement::Str(_)) } + fn into_str(self) -> String { match self { PathElement::Str(s) => s, _ => panic!(), } } + fn as_str(&self) -> &str { match self { PathElement::Str(s) => s.as_str(), @@ -380,10 +379,8 @@ impl ResourceDef { } if !pattern.is_empty() { // handle tail expression for static segment - if pattern.ends_with('*') { - let pattern = - Regex::new(&format!("^{}(.+)", &pattern[..pattern.len() - 1])) - .unwrap(); + if let Some(stripped) = pattern.strip_suffix('*') { + let pattern = Regex::new(&format!("^{}(.+)", stripped)).unwrap(); pelems.push(Segment::Dynamic { pattern, names: Vec::new(), diff --git a/ntex-router/src/tree.rs b/ntex-router/src/tree.rs index 5a1098a5..bfc18a0b 100644 --- a/ntex-router/src/tree.rs +++ b/ntex-router/src/tree.rs @@ -244,8 +244,8 @@ impl Tree { } } - let path = if path.starts_with('/') { - &path[1..] + let path = if let Some(path) = path.strip_prefix('/') { + path } else { base_skip -= 1; path @@ -282,8 +282,8 @@ impl Tree { return None; } - let path = if path.starts_with('/') { - &path[1..] + let path = if let Some(path) = path.strip_prefix('/') { + path } else { base_skip -= 1; path @@ -356,11 +356,8 @@ impl Tree { path.len() }; let segment = T::unquote(&path[..idx]); - let quoted = if let Cow::Owned(_) = segment { - true - } else { - false - }; + let quoted = matches!(segment, Cow::Owned(_)); + // check segment match let is_match = match key[0] { Segment::Static(ref pattern) => { diff --git a/ntex-rt/src/arbiter.rs b/ntex-rt/src/arbiter.rs index 25acd93e..febe4dd0 100644 --- a/ntex-rt/src/arbiter.rs +++ b/ntex-rt/src/arbiter.rs @@ -114,10 +114,7 @@ impl Arbiter { .unbounded_send(SystemCommand::RegisterArbiter(id, arb)); // run loop - let _ = match rt.block_on(stop_rx) { - Ok(code) => code, - Err(_) => 1, - }; + let _ = rt.block_on(stop_rx); // unregister arbiter let _ = System::current() diff --git a/ntex-rt/src/builder.rs b/ntex-rt/src/builder.rs index e3d5d9ed..9f29e38b 100644 --- a/ntex-rt/src/builder.rs +++ b/ntex-rt/src/builder.rs @@ -130,7 +130,7 @@ impl AsyncSystemRunner { // run loop lazy(|_| async { - let res = match stop.await { + match stop.await { Ok(code) => { if code != 0 { Err(io::Error::new( @@ -142,8 +142,7 @@ impl AsyncSystemRunner { } } Err(e) => Err(io::Error::new(io::ErrorKind::Other, e)), - }; - return res; + } }) .flatten() } diff --git a/ntex/src/http/body.rs b/ntex/src/http/body.rs index 481021eb..d91a77f8 100644 --- a/ntex/src/http/body.rs +++ b/ntex/src/http/body.rs @@ -18,10 +18,7 @@ pub enum BodySize { impl BodySize { pub fn is_eof(&self) -> bool { - match self { - BodySize::None | BodySize::Empty | BodySize::Sized(0) => true, - _ => false, - } + matches!(self, BodySize::None | BodySize::Empty | BodySize::Sized(0)) } } @@ -191,14 +188,8 @@ impl MessageBody for Body { impl PartialEq for Body { fn eq(&self, other: &Body) -> bool { match *self { - Body::None => match *other { - Body::None => true, - _ => false, - }, - Body::Empty => match *other { - Body::Empty => true, - _ => false, - }, + 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, diff --git a/ntex/src/http/client/h2proto.rs b/ntex/src/http/client/h2proto.rs index 01f632ed..446d9010 100644 --- a/ntex/src/http/client/h2proto.rs +++ b/ntex/src/http/client/h2proto.rs @@ -31,10 +31,10 @@ where trace!("Sending client request: {:?} {:?}", head, body.size()); let head_req = head.as_ref().method == Method::HEAD; let length = body.size(); - let eof = match length { - BodySize::None | BodySize::Empty | BodySize::Sized(0) => true, - _ => false, - }; + let eof = matches!( + length, + BodySize::None | BodySize::Empty | BodySize::Sized(0) + ); let mut req = Request::new(()); *req.uri_mut() = head.as_ref().uri.clone(); diff --git a/ntex/src/http/client/pool.rs b/ntex/src/http/client/pool.rs index dcd6c737..c774d674 100644 --- a/ntex/src/http/client/pool.rs +++ b/ntex/src/http/client/pool.rs @@ -140,11 +140,11 @@ where // use existing connection Acquire::Acquired(io, created) => { trace!("Use existing connection for {:?}", req.uri); - return Ok(IoConnection::new( + Ok(IoConnection::new( io, created, Some(Acquired(key, Some(inner))), - )); + )) } // open new tcp connection Acquire::Available => { diff --git a/ntex/src/http/client/sender.rs b/ntex/src/http/client/sender.rs index 70e6fa0f..3236897e 100644 --- a/ntex/src/http/client/sender.rs +++ b/ntex/src/http/client/sender.rs @@ -154,7 +154,7 @@ impl RequestHeadType { SendClientRequest::new( config.connector.send_request(self, body.into(), addr), response_decompress, - timeout.or_else(|| config.timeout), + timeout.or(config.timeout), ) } diff --git a/ntex/src/http/client/ws.rs b/ntex/src/http/client/ws.rs index 5466eb06..4d517050 100644 --- a/ntex/src/http/client/ws.rs +++ b/ntex/src/http/client/ws.rs @@ -11,7 +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, Method, StatusCode, Uri, Version}; +use crate::http::{ConnectionType, StatusCode, Uri}; use crate::http::{Payload, RequestHead}; use crate::rt::time::timeout; use crate::service::{IntoService, Service}; @@ -48,8 +48,6 @@ impl WebsocketsRequest { { let mut err = None; let mut head = RequestHead::default(); - head.method = Method::GET; - head.version = Version::HTTP_11; match Uri::try_from(uri) { Ok(uri) => head.uri = uri, diff --git a/ntex/src/http/h1/dispatcher.rs b/ntex/src/http/h1/dispatcher.rs index 692dee91..3d528873 100644 --- a/ntex/src/http/h1/dispatcher.rs +++ b/ntex/src/http/h1/dispatcher.rs @@ -254,14 +254,14 @@ where } // process incoming bytes stream - let mut not_completed = !this.inner.poll_read(cx)?; - this.inner.decode_payload()?; + let mut not_completed = !this.inner.poll_read(cx); + this.inner.decode_payload(); loop { // process incoming bytes stream, but only if // previous iteration didnt read whole buffer if not_completed { - not_completed = !this.inner.poll_read(cx)?; + not_completed = !this.inner.poll_read(cx); } let st = match this.call.project() { @@ -286,10 +286,10 @@ where // to read more data (ie serevice future can wait for payload data) if this.inner.req_payload.is_some() && not_completed { // read more from io stream - not_completed = !this.inner.poll_read(cx)?; + not_completed = !this.inner.poll_read(cx); // more payload chunks has been decoded - if this.inner.decode_payload()? { + if this.inner.decode_payload() { // restore consumed future this = self.as_mut().project(); fut = { @@ -353,7 +353,7 @@ where let write = if !this.inner.flags.contains(Flags::STARTED) { PollWrite::AllowNext } else { - this.inner.decode_payload()?; + this.inner.decode_payload(); this.inner.poll_write(cx)? }; match write { @@ -421,9 +421,7 @@ where } // keep-alive book-keeping - if this.inner.ka_timer.is_some() - && this.inner.poll_keepalive(cx, idle)? - { + if this.inner.ka_timer.is_some() && this.inner.poll_keepalive(cx, idle) { this.inner.poll_shutdown(cx) } else { Poll::Pending @@ -648,7 +646,7 @@ where } /// Read data from io stream - fn poll_read(&mut self, cx: &mut Context<'_>) -> Result { + fn poll_read(&mut self, cx: &mut Context<'_>) -> bool { let mut completed = false; // read socket data into a buf @@ -663,7 +661,7 @@ where .map(|info| info.need_read(cx) == PayloadStatus::Read) .unwrap_or(true) { - return Ok(false); + return false; } // read data from socket @@ -703,7 +701,7 @@ where } } - Ok(completed) + completed } fn internal_error(&mut self, msg: &'static str) -> DispatcherMessage { @@ -726,12 +724,12 @@ where DispatcherMessage::Error(Response::BadRequest().finish().drop_body()) } - fn decode_payload(&mut self) -> Result { + fn decode_payload(&mut self) -> bool { if self.flags.contains(Flags::READ_EOF) || self.req_payload.is_none() || self.read_buf.is_empty() { - return Ok(false); + return false; } let mut updated = false; @@ -772,12 +770,12 @@ where } } - Ok(updated) + updated } - fn decode_message(&mut self) -> Result, DispatchError> { + fn decode_message(&mut self) -> Option { if self.flags.contains(Flags::READ_EOF) || self.read_buf.is_empty() { - return Ok(None); + return None; } match self.codec.decode(&mut self.read_buf) { @@ -797,7 +795,7 @@ where // handle upgrade request if pl == MessageType::Stream && self.config.upgrade.is_some() { self.flags.insert(Flags::STOP_READING); - Ok(Some(DispatcherMessage::Upgrade(req))) + Some(DispatcherMessage::Upgrade(req)) } else { // handle request with payload if pl == MessageType::Payload || pl == MessageType::Stream { @@ -808,32 +806,28 @@ where self.req_payload = Some(ps); } - Ok(Some(DispatcherMessage::Request(req))) + Some(DispatcherMessage::Request(req)) } } - Message::Chunk(_) => Ok(Some(self.internal_error( + Message::Chunk(_) => Some(self.internal_error( "Internal server error: unexpected payload chunk", - ))), + )), } } Ok(None) => { self.flags.insert(Flags::READ_EOF); - Ok(None) + None } - Err(e) => Ok(Some(self.decode_error(e))), + Err(e) => Some(self.decode_error(e)), } } /// keep-alive timer - fn poll_keepalive( - &mut self, - cx: &mut Context<'_>, - idle: bool, - ) -> Result { + fn poll_keepalive(&mut self, cx: &mut Context<'_>, idle: bool) -> bool { let ka_timer = self.ka_timer.as_mut().unwrap(); // do nothing for disconnected or upgrade socket or if keep-alive timer is disabled if self.flags.contains(Flags::DISCONNECT) { - return Ok(false); + return false; } // slow request timeout else if !self.flags.contains(Flags::STARTED) { @@ -845,7 +839,7 @@ where ResponseBody::Other(Body::Empty), ); self.flags.insert(Flags::STARTED | Flags::SHUTDOWN); - return Ok(true); + return true; } } // normal keep-alive, but only if we are not processing any requests @@ -857,7 +851,7 @@ where if self.write_buf.is_empty() { trace!("Keep-alive timeout, close connection"); self.flags.insert(Flags::SHUTDOWN); - return Ok(true); + return true; } else if let Some(dl) = self.config.keep_alive_expire() { // extend keep-alive timer ka_timer.reset(dl); @@ -868,7 +862,7 @@ where let _ = Pin::new(ka_timer).poll(cx); } } - Ok(false) + false } fn process_response( @@ -888,11 +882,11 @@ where &mut self, io: CallProcess, ) -> Result, DispatchError> { - while let Some(msg) = self.decode_message()? { + while let Some(msg) = self.decode_message() { return match msg { DispatcherMessage::Request(req) => { if self.req_payload.is_some() { - self.decode_payload()?; + self.decode_payload(); } // Handle `EXPECT: 100-Continue` header diff --git a/ntex/src/http/header/mod.rs b/ntex/src/http/header/mod.rs index 0ce1da00..93235bbf 100644 --- a/ntex/src/http/header/mod.rs +++ b/ntex/src/http/header/mod.rs @@ -27,10 +27,7 @@ impl ContentEncoding { #[inline] /// Is the content compressed? pub fn is_compressed(self) -> bool { - match self { - ContentEncoding::Identity | ContentEncoding::Auto => false, - _ => true, - } + !matches!(self, ContentEncoding::Identity | ContentEncoding::Auto) } #[inline] diff --git a/ntex/src/http/response.rs b/ntex/src/http/response.rs index 79a2cabf..9a0fd1a5 100644 --- a/ntex/src/http/response.rs +++ b/ntex/src/http/response.rs @@ -741,6 +741,7 @@ impl fmt::Debug for ResponseBuilder { } } +#[allow(clippy::unnecessary_wraps)] fn log_error>(err: T) -> Option { let e = err.into(); error!("Error in ResponseBuilder {}", e); diff --git a/ntex/src/server/config.rs b/ntex/src/server/config.rs index 8dfabff7..a30ed218 100644 --- a/ntex/src/server/config.rs +++ b/ntex/src/server/config.rs @@ -150,7 +150,7 @@ impl InternalServiceFactory for ConfiguredService { )); }; } - return Ok(res); + Ok(res) } .boxed_local() } @@ -271,13 +271,13 @@ where fn new_service(&self, _: ()) -> Self::Future { let fut = self.inner.new_service(()); async move { - return match fut.await { + match fut.await { Ok(s) => Ok(Box::new(StreamService::new(s)) as BoxedServerService), Err(e) => { error!("Can not construct service: {:?}", e); Err(()) } - }; + } } .boxed_local() } diff --git a/ntex/src/web/types/payload.rs b/ntex/src/web/types/payload.rs index a4639d80..2b2f4d9d 100644 --- a/ntex/src/web/types/payload.rs +++ b/ntex/src/web/types/payload.rs @@ -232,7 +232,7 @@ impl FromRequest for String { Ok(encoding .decode_without_bom_handling_and_without_replacement(&body) .map(|s| s.into_owned()) - .ok_or_else(|| PayloadError::Decoding)?) + .ok_or(PayloadError::Decoding)?) } } .boxed_local(), @@ -249,9 +249,10 @@ pub struct PayloadConfig { impl PayloadConfig { /// Create `PayloadConfig` instance and set max size of payload. pub fn new(limit: usize) -> Self { - let mut cfg = Self::default(); - cfg.limit = limit; - cfg + PayloadConfig { + limit, + ..Default::default() + } } /// Change max size of payload. By default max size is 256Kb