feat(client,server): remove tcp feature and code

hyperium · Jul 28, 2022 · 7e50b5d · 7e50b5d
1 parent d4b5bd4
commit 7e50b5d
Show file tree

Hide file tree

Showing 40 changed files with 1,649 additions and 2,760 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -94,12 +94,6 @@ server = []
 
 # Tokio support
 runtime = [
-    "tcp",
-    "tokio/rt",
-    "tokio/time",
-]
-tcp = [
-    "socket2",
     "tokio/net",
     "tokio/rt",
     "tokio/time",

diff --git a/benches/connect.rs b/benches/connect.rs
@@ -3,35 +3,38 @@
 
 extern crate test;
 
-use http::Uri;
-use hyper::client::connect::HttpConnector;
-use hyper::service::Service;
-use std::net::SocketAddr;
-use tokio::net::TcpListener;
+// TODO: Reimplement http_connector bench using hyper::client::conn
+// (instead of removed HttpConnector).
 
-#[bench]
-fn http_connector(b: &mut test::Bencher) {
-    let _ = pretty_env_logger::try_init();
-    let rt = tokio::runtime::Builder::new_current_thread()
-        .enable_all()
-        .build()
-        .expect("rt build");
-    let listener = rt
-        .block_on(TcpListener::bind(&SocketAddr::from(([127, 0, 0, 1], 0))))
-        .expect("bind");
-    let addr = listener.local_addr().expect("local_addr");
-    let dst: Uri = format!("http://{}/", addr).parse().expect("uri parse");
-    let mut connector = HttpConnector::new();
+// use http::Uri;
+// use hyper::client::connect::HttpConnector;
+// use hyper::service::Service;
+// use std::net::SocketAddr;
+// use tokio::net::TcpListener;
 
-    rt.spawn(async move {
-        loop {
-            let _ = listener.accept().await;
-        }
-    });
+// #[bench]
+// fn http_connector(b: &mut test::Bencher) {
+//     let _ = pretty_env_logger::try_init();
+//     let rt = tokio::runtime::Builder::new_current_thread()
+//         .enable_all()
+//         .build()
+//         .expect("rt build");
+//     let listener = rt
+//         .block_on(TcpListener::bind(&SocketAddr::from(([127, 0, 0, 1], 0))))
+//         .expect("bind");
+//     let addr = listener.local_addr().expect("local_addr");
+//     let dst: Uri = format!("http://{}/", addr).parse().expect("uri parse");
+//     let mut connector = HttpConnector::new();
 
-    b.iter(|| {
-        rt.block_on(async {
-            connector.call(dst.clone()).await.expect("connect");
-        });
-    });
-}
+//     rt.spawn(async move {
+//         loop {
+//             let _ = listener.accept().await;
+//         }
+//     });
+
+//     b.iter(|| {
+//         rt.block_on(async {
+//             connector.call(dst.clone()).await.expect("connect");
+//         });
+//     });
+// }