summaryrefslogtreecommitdiff
path: root/ext/websocket
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-12-27 17:59:57 +0100
committerGitHub <noreply@github.com>2023-12-27 11:59:57 -0500
commitc2414db1f68d27db8ca6f192f0ff877f1394164c (patch)
tree528da9796f400557204bfdb8e4d44d64173036ce /ext/websocket
parent33acd437f52b418a8413a302dd8902abad2eabec (diff)
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
Diffstat (limited to 'ext/websocket')
-rw-r--r--ext/websocket/Cargo.toml6
-rw-r--r--ext/websocket/lib.rs2
-rw-r--r--ext/websocket/stream.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
index ac210f9ba..1ccbefd56 100644
--- a/ext/websocket/Cargo.toml
+++ b/ext/websocket/Cargo.toml
@@ -19,11 +19,11 @@ deno_core.workspace = true
deno_net.workspace = true
deno_tls.workspace = true
fastwebsockets.workspace = true
-h2 = "0.4"
-http = "1.0"
+h2.workspace = true
+http.workspace = true
http-body-util.workspace = true
+hyper.workspace = true
hyper-util.workspace = true
-hyper1.workspace = true
once_cell.workspace = true
rustls-tokio-stream.workspace = true
serde.workspace = true
diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
index d1692fe19..c0bf4ad00 100644
--- a/ext/websocket/lib.rs
+++ b/ext/websocket/lib.rs
@@ -891,7 +891,7 @@ pub fn get_network_error_class_name(e: &AnyError) -> Option<&'static str> {
#[derive(Clone)]
struct LocalExecutor;
-impl<Fut> hyper1::rt::Executor<Fut> for LocalExecutor
+impl<Fut> hyper::rt::Executor<Fut> for LocalExecutor
where
Fut: Future + 'static,
Fut::Output: 'static,
diff --git a/ext/websocket/stream.rs b/ext/websocket/stream.rs
index 88c053dc5..e82d7d1fc 100644
--- a/ext/websocket/stream.rs
+++ b/ext/websocket/stream.rs
@@ -4,7 +4,7 @@ use bytes::Bytes;
use deno_net::raw::NetworkStream;
use h2::RecvStream;
use h2::SendStream;
-use hyper1::upgrade::Upgraded;
+use hyper::upgrade::Upgraded;
use hyper_util::rt::TokioIo;
use std::io::ErrorKind;
use std::pin::Pin;