From 6f7a6bca9416127a055eaf945b478bbdc03645b8 Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Mon, 27 Sep 2021 21:34:21 +0200 Subject: [PATCH] refactor: fix rust edition idioms --- src/bin/server.rs | 5 ++--- src/lib.rs | 1 + src/service.rs | 4 ++-- src/tls.rs | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/server.rs b/src/bin/server.rs index 7dcc0db..90eb6a2 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -1,12 +1,11 @@ #![deny(warnings)] +#![deny(rust_2018_idioms)] #[cfg(all(target_env = "musl", target_pointer_width = "64"))] #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -extern crate static_web_server; - -use self::static_web_server::{Result, Server}; +use static_web_server::{Result, Server}; fn main() -> Result { Server::new().run()?; diff --git a/src/lib.rs b/src/lib.rs index b1b4ae7..aa05b3f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ #![deny(warnings)] +#![deny(rust_2018_idioms)] #[macro_use] extern crate anyhow; diff --git a/src/service.rs b/src/service.rs index 3e5ab9e..7f5aa8b 100644 --- a/src/service.rs +++ b/src/service.rs @@ -26,7 +26,7 @@ impl Service for RouterService { type Error = Infallible; type Future = Ready>; - fn poll_ready(&mut self, _: &mut Context) -> Poll> { + fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } @@ -45,7 +45,7 @@ impl Service> for RequestService { type Error = Error; type Future = Pin, Error>> + Send + 'static>>; - fn poll_ready(&mut self, _: &mut Context) -> Poll> { + fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll> { Poll::Ready(Ok(())) } diff --git a/src/tls.rs b/src/tls.rs index d8e7df0..997120a 100644 --- a/src/tls.rs +++ b/src/tls.rs @@ -71,7 +71,7 @@ pub struct TlsConfigBuilder { } impl std::fmt::Debug for TlsConfigBuilder { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> ::std::fmt::Result { f.debug_struct("TlsConfigBuilder").finish() } } @@ -303,8 +303,8 @@ impl TlsStream { impl AsyncRead for TlsStream { fn poll_read( self: Pin<&mut Self>, - cx: &mut Context, - buf: &mut ReadBuf, + cx: &mut Context<'_>, + buf: &mut ReadBuf<'_>, ) -> Poll> { let pin = self.get_mut(); match pin.state { -- libgit2 1.7.2