fmt

Author: 0x676e67

src/client/http/connect/verbose.rs

@@ -85,7 +85,7 @@ mod sealed {
             mut self: Pin<&mut Self>,
             cx: &mut Context,
             buf: &[u8],
-        ) -> Poll<Result<usize, std::io::Error>> {
+        ) -> Poll<io::Result<usize>> {
             match Pin::new(&mut self.inner).poll_write(cx, buf) {
                 Poll::Ready(Ok(n)) => {
                     trace!("{:08x} write: {:?}", self.id, Escape::new(&buf[..n]));
@@ -100,7 +100,7 @@ mod sealed {
             mut self: Pin<&mut Self>,
             cx: &mut Context<'_>,
             bufs: &[IoSlice<'_>],
-        ) -> Poll<Result<usize, io::Error>> {
+        ) -> Poll<io::Result<usize>> {
             match Pin::new(&mut self.inner).poll_write_vectored(cx, bufs) {
                 Poll::Ready(Ok(nwritten)) => {
                     trace!(

src/core/client/connect/http.rs

@@ -811,7 +811,7 @@ impl ConnectingTcpRemote {
             Some(e) => Err(e),
             None => Err(ConnectError::new(
                 "tcp connect error",
-                std::io::Error::new(io::ErrorKind::NotConnected, "Network unreachable"),
+                io::Error::new(io::ErrorKind::NotConnected, "Network unreachable"),
             )),
         }
     }

src/core/client/connect/proxy/tunnel.rs

@@ -233,7 +233,7 @@ where
     }
 }
 
-async fn read<T>(io: &mut T, buf: &mut [u8]) -> Result<usize, std::io::Error>
+async fn read<T>(io: &mut T, buf: &mut [u8]) -> io::Result<usize>
 where
     T: AsyncRead + Unpin,
 {

src/core/client/connect/uds.rs

@@ -1,4 +1,5 @@
 use std::{
+    io,
     path::Path,
     pin::Pin,
     sync::Arc,
@@ -10,15 +11,15 @@ use tokio::net::UnixStream;
 
 use super::{Connected, Connection};
 
-type ConnectResult = Result<UnixStream, std::io::Error>;
+type ConnectResult = io::Result<UnixStream>;
 type BoxConnecting = Pin<Box<dyn Future<Output = ConnectResult> + Send>>;
 
 #[derive(Clone)]
 pub struct UnixConnector(pub(crate) Arc<Path>);
 
 impl tower::Service<Uri> for UnixConnector {
     type Response = UnixStream;
-    type Error = std::io::Error;
+    type Error = io::Error;
     type Future = BoxConnecting;
 
     #[inline]
@@ -30,7 +31,7 @@ impl tower::Service<Uri> for UnixConnector {
         let fut = UnixStream::connect(self.0.clone());
         Box::pin(async move {
             let io = fut.await?;
-            Ok::<_, std::io::Error>(io)
+            Ok::<_, io::Error>(io)
         })
     }
 }

src/core/client/proto/h2/mod.rs

@@ -287,7 +287,7 @@ where
                         return Poll::Ready(match e.reason() {
                             Some(Reason::NO_ERROR) | Some(Reason::CANCEL) => Ok(()),
                             Some(Reason::STREAM_CLOSED) => {
-                                Err(std::io::Error::new(io::ErrorKind::BrokenPipe, e))
+                                Err(io::Error::new(io::ErrorKind::BrokenPipe, e))
                             }
                             _ => Err(h2_to_io_error(e)),
                         });
@@ -311,7 +311,7 @@ where
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
         buf: &[u8],
-    ) -> Poll<Result<usize, std::io::Error>> {
+    ) -> Poll<io::Result<usize>> {
         if buf.is_empty() {
             return Poll::Ready(Ok(0));
         }

tests/support/server.rs

@@ -1,5 +1,5 @@
 use std::{
-    convert::Infallible, future::Future, net, sync::mpsc as std_mpsc, thread, time::Duration,
+    convert::Infallible, future::Future, io, net, sync::mpsc as std_mpsc, thread, time::Duration,
 };
 
 use tokio::{io::AsyncReadExt, net::TcpStream, runtime, sync::oneshot};
@@ -205,9 +205,7 @@ where
 }
 
 #[allow(unused)]
-async fn low_level_read_http_request(
-    client_socket: &mut TcpStream,
-) -> core::result::Result<Vec<u8>, std::io::Error> {
+async fn low_level_read_http_request(client_socket: &mut TcpStream) -> io::Result<Vec<u8>> {
     let mut buf = Vec::new();
 
     // Read until the delimiter "\r\n\r\n" is found