refactor: simplify hyper, http, h2 deps (#21715)

Main change is that:
- "hyper" has been renamed to "hyper_v014" to signal that it's legacy
- "hyper1" has been renamed to "hyper" and should be the default

1 files changed, 23 insertions, 23 deletions

diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index db18d1812..a2b49b749 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -4379,32 +4379,32 @@ async fn websocketstream_ping() {
   let script = util::testdata_path().join("run/websocketstream_ping_test.ts");
   let root_ca = util::testdata_path().join("tls/RootCA.pem");
 
-  let srv_fn = hyper1::service::service_fn(|mut req| async move {
+  let srv_fn = hyper::service::service_fn(|mut req| async move {
     let (response, upgrade_fut) =
-      fastwebsockets_06::upgrade::upgrade(&mut req).unwrap();
+      fastwebsockets::upgrade::upgrade(&mut req).unwrap();
     tokio::spawn(async move {
       let mut ws = upgrade_fut.await.unwrap();
 
-      ws.write_frame(fastwebsockets_06::Frame::text(b"A"[..].into()))
+      ws.write_frame(fastwebsockets::Frame::text(b"A"[..].into()))
         .await
         .unwrap();
-      ws.write_frame(fastwebsockets_06::Frame::new(
+      ws.write_frame(fastwebsockets::Frame::new(
         true,
-        fastwebsockets_06::OpCode::Ping,
+        fastwebsockets::OpCode::Ping,
         None,
         vec![].into(),
       ))
       .await
       .unwrap();
-      ws.write_frame(fastwebsockets_06::Frame::text(b"B"[..].into()))
+      ws.write_frame(fastwebsockets::Frame::text(b"B"[..].into()))
         .await
         .unwrap();
       let message = ws.read_frame().await.unwrap();
-      assert_eq!(message.opcode, fastwebsockets_06::OpCode::Pong);
-      ws.write_frame(fastwebsockets_06::Frame::text(b"C"[..].into()))
+      assert_eq!(message.opcode, fastwebsockets::OpCode::Pong);
+      ws.write_frame(fastwebsockets::Frame::text(b"C"[..].into()))
         .await
         .unwrap();
-      ws.write_frame(fastwebsockets_06::Frame::close_raw(vec![].into()))
+      ws.write_frame(fastwebsockets::Frame::close_raw(vec![].into()))
         .await
         .unwrap();
     });
@@ -4427,7 +4427,7 @@ async fn websocketstream_ping() {
   tokio::spawn(async move {
     let (stream, _) = server.accept().await.unwrap();
     let io = hyper_util::rt::TokioIo::new(stream);
-    let conn_fut = hyper1::server::conn::http1::Builder::new()
+    let conn_fut = hyper::server::conn::http1::Builder::new()
       .serve_connection(io, srv_fn)
       .with_upgrades();
 
@@ -4442,7 +4442,7 @@ async fn websocketstream_ping() {
 
 struct SpawnExecutor;
 
-impl<Fut> hyper1::rt::Executor<Fut> for SpawnExecutor
+impl<Fut> hyper::rt::Executor<Fut> for SpawnExecutor
 where
   Fut: std::future::Future + Send + 'static,
   Fut::Output: Send + 'static,
@@ -4478,12 +4478,12 @@ async fn websocket_server_multi_field_connection_header() {
   let stream = tokio::net::TcpStream::connect("localhost:4319")
     .await
     .unwrap();
-  let req = http_1::Request::builder()
-    .header(http_1::header::UPGRADE, "websocket")
-    .header(http_1::header::CONNECTION, "keep-alive, Upgrade")
+  let req = http::Request::builder()
+    .header(http::header::UPGRADE, "websocket")
+    .header(http::header::CONNECTION, "keep-alive, Upgrade")
     .header(
       "Sec-WebSocket-Key",
-      fastwebsockets_06::handshake::generate_key(),
+      fastwebsockets::handshake::generate_key(),
     )
     .header("Sec-WebSocket-Version", "13")
     .uri("ws://localhost:4319")
@@ -4491,15 +4491,15 @@ async fn websocket_server_multi_field_connection_header() {
     .unwrap();
 
   let (mut socket, _) =
-    fastwebsockets_06::handshake::client(&SpawnExecutor, req, stream)
+    fastwebsockets::handshake::client(&SpawnExecutor, req, stream)
       .await
       .unwrap();
 
   let message = socket.read_frame().await.unwrap();
-  assert_eq!(message.opcode, fastwebsockets_06::OpCode::Close);
+  assert_eq!(message.opcode, fastwebsockets::OpCode::Close);
   assert!(message.payload.is_empty());
   socket
-    .write_frame(fastwebsockets_06::Frame::close_raw(vec![].into()))
+    .write_frame(fastwebsockets::Frame::close_raw(vec![].into()))
     .await
     .unwrap();
   assert!(child.wait().unwrap().success());
@@ -4533,12 +4533,12 @@ async fn websocket_server_idletimeout() {
   let stream = tokio::net::TcpStream::connect("localhost:4509")
     .await
     .unwrap();
-  let req = http_1::Request::builder()
-    .header(http_1::header::UPGRADE, "websocket")
-    .header(http_1::header::CONNECTION, "keep-alive, Upgrade")
+  let req = http::Request::builder()
+    .header(http::header::UPGRADE, "websocket")
+    .header(http::header::CONNECTION, "keep-alive, Upgrade")
     .header(
       "Sec-WebSocket-Key",
-      fastwebsockets_06::handshake::generate_key(),
+      fastwebsockets::handshake::generate_key(),
     )
     .header("Sec-WebSocket-Version", "13")
     .uri("ws://localhost:4509")
@@ -4546,7 +4546,7 @@ async fn websocket_server_idletimeout() {
     .unwrap();
 
   let (_socket, _) =
-    fastwebsockets_06::handshake::client(&SpawnExecutor, req, stream)
+    fastwebsockets::handshake::client(&SpawnExecutor, req, stream)
       .await
       .unwrap();