diff --git a/src/body/body.rs b/src/body/body.rs index 939b4f56..74bac989 100644 --- a/src/body/body.rs +++ b/src/body/body.rs @@ -136,7 +136,7 @@ impl Body { /// /// ``` /// # use hyper::Body; - /// let chunks: Vec> = vec![ + /// let chunks: Vec> = vec![ /// Ok("hello"), /// Ok(" "), /// Ok("world"), diff --git a/src/client/connect/http.rs b/src/client/connect/http.rs index 3e342d19..22f679dc 100644 --- a/src/client/connect/http.rs +++ b/src/client/connect/http.rs @@ -692,7 +692,7 @@ mod tests { let local_timeout = Duration::default(); let unreachable_v4_timeout = measure_connect(unreachable_ipv4_addr()).1; let unreachable_v6_timeout = measure_connect(unreachable_ipv6_addr()).1; - let fallback_timeout = ::std::cmp::max(unreachable_v4_timeout, unreachable_v6_timeout) + let fallback_timeout = std::cmp::max(unreachable_v4_timeout, unreachable_v6_timeout) + Duration::from_millis(250); let scenarios = &[ @@ -849,7 +849,7 @@ mod tests { fn measure_connect(addr: IpAddr) -> (bool, Duration) { let start = Instant::now(); let result = - ::std::net::TcpStream::connect_timeout(&(addr, 80).into(), Duration::from_secs(1)); + std::net::TcpStream::connect_timeout(&(addr, 80).into(), Duration::from_secs(1)); let reachable = result.is_ok() || result.unwrap_err().kind() == io::ErrorKind::TimedOut; let duration = start.elapsed(); diff --git a/src/client/pool.rs b/src/client/pool.rs index e98dcdde..951a8408 100644 --- a/src/client/pool.rs +++ b/src/client/pool.rs @@ -171,7 +171,7 @@ impl Pool { } #[cfg(test)] - fn locked(&self) -> ::std::sync::MutexGuard<'_, PoolInner> { + fn locked(&self) -> std::sync::MutexGuard<'_, PoolInner> { self.inner.as_ref().expect("enabled").lock().expect("lock") } @@ -902,7 +902,7 @@ mod tests { super::Config { enabled: true, keep_alive_timeout: Some(Duration::from_millis(10)), - max_idle_per_host: ::std::usize::MAX, + max_idle_per_host: std::usize::MAX, }, &Exec::Default, ); diff --git a/src/client/tests.rs b/src/client/tests.rs index cf3248c7..e955cb60 100644 --- a/src/client/tests.rs +++ b/src/client/tests.rs @@ -51,7 +51,7 @@ fn retryable_request() { try_ready!(sock1.read(&mut [0u8; 512])); try_ready!(sock1.write(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv1 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv1 poll_fn error: {}", e)); rt.block_on(res1.join(srv1)).expect("res1"); } drop(sock1); @@ -68,7 +68,7 @@ fn retryable_request() { try_ready!(sock2.read(&mut [0u8; 512])); try_ready!(sock2.write(b"HTTP/1.1 222 OK\r\nContent-Length: 0\r\n\r\n")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv2 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv2 poll_fn error: {}", e)); rt.block_on(res2.join(srv2)).expect("res2"); } @@ -97,7 +97,7 @@ fn conn_reset_after_write() { try_ready!(sock1.read(&mut [0u8; 512])); try_ready!(sock1.write(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv1 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv1 poll_fn error: {}", e)); rt.block_on(res1.join(srv1)).expect("res1"); } @@ -117,7 +117,7 @@ fn conn_reset_after_write() { try_ready!(sock1.as_mut().unwrap().read(&mut [0u8; 512])); sock1.take(); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv2 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv2 poll_fn error: {}", e)); let err = rt.block_on(res2.join(srv2)).expect_err("res2"); assert!(err.is_incomplete_message(), "{:?}", err); } @@ -159,7 +159,7 @@ fn checkout_win_allows_connect_future_to_be_pooled() { 0\r\n\r\n\ ")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv1 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv1 poll_fn error: {}", e)); rt.block_on(res1.join(srv1)).expect("res1").0 }; @@ -177,7 +177,7 @@ fn checkout_win_allows_connect_future_to_be_pooled() { try_ready!(sock1.read(&mut [0u8; 512])); try_ready!(sock1.write(b"HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nx")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv2 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv2 poll_fn error: {}", e)); rt.block_on(res2.join(drain).join(srv2)).expect("res2"); } @@ -214,7 +214,7 @@ fn checkout_win_allows_connect_future_to_be_pooled() { try_ready!(sock2.read(&mut [0u8; 512])); try_ready!(sock2.write(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv3 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv3 poll_fn error: {}", e)); rt.block_on(res3.join(srv3)).expect("res3"); } @@ -247,7 +247,7 @@ fn bench_http1_get_0b(b: &mut test::Bencher) { try_ready!(sock1.read(&mut [0u8; 512])); try_ready!(sock1.write(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv1 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv1 poll_fn error: {}", e)); rt.block_on(res1.join(srv1)).expect("res1"); }); } @@ -279,7 +279,7 @@ fn bench_http1_get_10b(b: &mut test::Bencher) { try_ready!(sock1.read(&mut [0u8; 512])); try_ready!(sock1.write(b"HTTP/1.1 200 OK\r\nContent-Length: 10\r\n\r\n0123456789")); Ok(Async::Ready(())) - }).map_err(|e: ::std::io::Error| panic!("srv1 poll_fn error: {}", e)); + }).map_err(|e: std::io::Error| panic!("srv1 poll_fn error: {}", e)); rt.block_on(res1.join(srv1)).expect("res1"); }); } diff --git a/src/common/mod.rs b/src/common/mod.rs index 3716a56c..e436fe5e 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -1,8 +1,8 @@ macro_rules! ready { ($e:expr) => { match $e { - ::std::task::Poll::Ready(v) => v, - ::std::task::Poll::Pending => return ::std::task::Poll::Pending, + std::task::Poll::Ready(v) => v, + std::task::Poll::Pending => return std::task::Poll::Pending, } }; } diff --git a/src/error.rs b/src/error.rs index e9da230a..2a9ea923 100644 --- a/src/error.rs +++ b/src/error.rs @@ -4,7 +4,7 @@ use std::fmt; use std::io; /// Result type often returned from methods that can have hyper `Error`s. -pub type Result = ::std::result::Result; +pub type Result = std::result::Result; type Cause = Box; diff --git a/src/mock.rs b/src/mock.rs index 9b792855..1dd57de3 100644 --- a/src/mock.rs +++ b/src/mock.rs @@ -37,7 +37,7 @@ impl Duplex { let mut inner = DuplexInner { handle_read_task: None, read: AsyncIo::new_buf(Vec::new(), 0), - write: AsyncIo::new_buf(Vec::new(), ::std::usize::MAX), + write: AsyncIo::new_buf(Vec::new(), std::usize::MAX), }; inner.read.park_tasks(true); diff --git a/src/proto/h1/conn.rs b/src/proto/h1/conn.rs index 8f3532b9..bcf28d4b 100644 --- a/src/proto/h1/conn.rs +++ b/src/proto/h1/conn.rs @@ -777,7 +777,7 @@ impl fmt::Debug for Writing { } } -impl ::std::ops::BitAndAssign for KA { +impl std::ops::BitAndAssign for KA { fn bitand_assign(&mut self, enabled: bool) { if !enabled { trace!("remote disabling keep-alive"); @@ -1041,7 +1041,7 @@ mod tests { conn.state.idle(); match conn.poll() { - Err(ref err) if err.kind() == ::std::io::ErrorKind::UnexpectedEof => {}, + Err(ref err) if err.kind() == std::io::ErrorKind::UnexpectedEof => {}, other => panic!("unexpected frame: {:?}", other) } } @@ -1065,7 +1065,7 @@ mod tests { conn.state.busy(); match conn.poll() { - Err(ref err) if err.kind() == ::std::io::ErrorKind::UnexpectedEof => {}, + Err(ref err) if err.kind() == std::io::ErrorKind::UnexpectedEof => {}, other => panic!("unexpected frame: {:?}", other) } Ok(()) diff --git a/src/proto/h1/decode.rs b/src/proto/h1/decode.rs index cbc7140d..17359b03 100644 --- a/src/proto/h1/decode.rs +++ b/src/proto/h1/decode.rs @@ -386,7 +386,7 @@ mod tests { impl<'a> MemRead for &'a [u8] { fn read_mem(&mut self, _: &mut task::Context<'_>, len: usize) -> Poll> { - let n = ::std::cmp::min(len, self.len()); + let n = std::cmp::min(len, self.len()); if n > 0 { let (a, b) = self.split_at(n); let buf = Bytes::copy_from_slice(a); diff --git a/src/proto/h1/io.rs b/src/proto/h1/io.rs index 70f704e0..00f4f64f 100644 --- a/src/proto/h1/io.rs +++ b/src/proto/h1/io.rs @@ -278,7 +278,7 @@ where { fn read_mem(&mut self, cx: &mut task::Context<'_>, len: usize) -> Poll> { if !self.read_buf.is_empty() { - let n = ::std::cmp::min(len, self.read_buf.len()); + let n = std::cmp::min(len, self.read_buf.len()); Poll::Ready(Ok(self.read_buf.split_to(n).freeze())) } else { let n = ready!(self.poll_read_from_io(cx))?; @@ -773,7 +773,7 @@ mod tests { } let mut max = 8192; - while max < ::std::usize::MAX { + while max < std::usize::MAX { fuzz(max); max = (max / 2).saturating_mul(3); } diff --git a/src/proto/mod.rs b/src/proto/mod.rs index 3dbac84f..7268e212 100644 --- a/src/proto/mod.rs +++ b/src/proto/mod.rs @@ -50,7 +50,7 @@ mod body_length { #[derive(Clone, Copy, PartialEq, Eq)] pub(crate) struct DecodedLength(u64); - const MAX_LEN: u64 = ::std::u64::MAX - 2; + const MAX_LEN: u64 = std::u64::MAX - 2; impl DecodedLength { pub(crate) const CLOSE_DELIMITED: DecodedLength = DecodedLength(::std::u64::MAX); diff --git a/tests/client.rs b/tests/client.rs index 73693552..34be3ec3 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -21,7 +21,7 @@ use tokio::net::TcpStream; use tokio::runtime::Runtime; fn s(buf: &[u8]) -> &str { - ::std::str::from_utf8(buf).expect("from_utf8") + std::str::from_utf8(buf).expect("from_utf8") } fn tcp_connect(addr: &SocketAddr) -> impl Future> { @@ -2503,7 +2503,7 @@ trait FutureHyperExt: TryFuture { impl FutureHyperExt for F where F: TryFuture + 'static, - F::Error: ::std::fmt::Debug, + F::Error: std::fmt::Debug, { fn expect(self, msg: &'static str) -> Pin>> { Box::pin( diff --git a/tests/server.rs b/tests/server.rs index 59ef0f6f..12484efc 100644 --- a/tests/server.rs +++ b/tests/server.rs @@ -2157,7 +2157,7 @@ impl ServeOptions { } fn s(buf: &[u8]) -> &str { - ::std::str::from_utf8(buf).unwrap() + std::str::from_utf8(buf).unwrap() } fn has_header(msg: &str, name: &str) -> bool { diff --git a/tests/support/mod.rs b/tests/support/mod.rs index 9bbc6370..a0c02e03 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -208,12 +208,12 @@ macro_rules! __internal_headers_map { macro_rules! __internal_headers_eq { (@pat $name: expr, $pat:pat) => { - ::std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { + std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { match __hdrs.get($name) { $pat => (), other => panic!("headers[{}] was not {}: {:?}", stringify!($name), stringify!($pat), other), } - }) as ::std::sync::Arc + }) as std::sync::Arc }; (@val $name: expr, NONE) => { __internal_headers_eq!(@pat $name, None); @@ -223,13 +223,13 @@ macro_rules! __internal_headers_eq { }; (@val $name: expr, $val:expr) => ({ let __val = Option::from($val); - ::std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { + std::sync::Arc::new(move |__hdrs: &hyper::HeaderMap| { if let Some(ref val) = __val { assert_eq!(__hdrs.get($name).expect(stringify!($name)), val.to_string().as_str(), stringify!($name)); } else { assert_eq!(__hdrs.get($name), None, stringify!($name)); } - }) as ::std::sync::Arc + }) as std::sync::Arc }); ($headers:ident, { $($name:expr => $val:tt,)* }) => { $(