refactor: fix rust edition idioms

joseluisq · joseluisq · commit 6f7a6bca9416 · 2021-09-27T21:34:21.000+02:00
diff --git 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
@@ -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
@@ -26,7 +26,7 @@ impl<T> Service<T> for RouterService {
     type Error = Infallible;
     type Future = Ready<Result<Self::Response, Self::Error>>;
 
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
+    fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(Ok(()))
     }
 
@@ -45,7 +45,7 @@ impl Service<Request<Body>> for RequestService {
     type Error = Error;
     type Future = Pin<Box<dyn Future<Output = Result<Response<Body>, Error>> + Send + 'static>>;
 
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Error>> {
+    fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Error>> {
         Poll::Ready(Ok(()))
     }
 
diff --git 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<io::Result<()>> {
         let pin = self.get_mut();
         match pin.state {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#![deny(warnings)]`
	`2`	`+#![deny(rust_2018_idioms)]`
`2`	`3`
`3`	`4`	`#[macro_use]`
`4`	`5`	`extern crate anyhow;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl<T> Service<T> for RouterService {`
`26`	`26`	`type Error = Infallible;`
`27`	`27`	`type Future = Ready<Result<Self::Response, Self::Error>>;`
`28`	`28`
`29`		`- fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {`
	`29`	`+ fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {`
`30`	`30`	`Poll::Ready(Ok(()))`
`31`	`31`	`}`
`32`	`32`
`@@ -45,7 +45,7 @@ impl Service<Request<Body>> for RequestService {`
`45`	`45`	`type Error = Error;`
`46`	`46`	`type Future = Pin<Box<dyn Future<Output = Result<Response<Body>, Error>> + Send + 'static>>;`
`47`	`47`
`48`		`- fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Error>> {`
	`48`	`+ fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Error>> {`
`49`	`49`	`Poll::Ready(Ok(()))`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ pub struct TlsConfigBuilder {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`impl std::fmt::Debug for TlsConfigBuilder {`
`74`		`- fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {`
	`74`	`+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> ::std::fmt::Result {`
`75`	`75`	`f.debug_struct("TlsConfigBuilder").finish()`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -303,8 +303,8 @@ impl TlsStream {`
`303`	`303`	`impl AsyncRead for TlsStream {`
`304`	`304`	`fn poll_read(`
`305`	`305`	`self: Pin<&mut Self>,`
`306`		`- cx: &mut Context,`
`307`		`- buf: &mut ReadBuf,`
	`306`	`+ cx: &mut Context<'_>,`
	`307`	`+ buf: &mut ReadBuf<'_>,`
`308`	`308`	`) -> Poll<io::Result<()>> {`
`309`	`309`	`let pin = self.get_mut();`
`310`	`310`	`match pin.state {`