Skip to content

Commit 6b0e0ae

Browse files
committed
chore: remove expicit hyper dependency
We're no longer depending on `hyper` directly in any way after the 1.0 upgrade, so replace it with the `http` library instead.
1 parent 8a47723 commit 6b0e0ae

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ sshx-core = { version = "0.4.0", path = "crates/sshx-core" }
2121
tokio = { version = "1.40.0", features = ["full"] }
2222
tokio-stream = { version = "0.1.14", features = ["sync"] }
2323
tonic = { version = "0.12.3", features = ["tls", "tls-webpki-roots"] }
24+
tonic-build = "0.12.3"
25+
tonic-reflection = "0.12.3"
2426
tracing = "0.1.37"
2527
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
2628

crates/sshx-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ serde.workspace = true
1616
tonic.workspace = true
1717

1818
[build-dependencies]
19-
tonic-build = "0.12.3"
19+
tonic-build.workspace = true

crates/sshx-server/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ deadpool = "0.12.2"
2323
deadpool-redis = "0.18.0"
2424
futures-util = { version = "0.3.28", features = ["sink"] }
2525
hmac = "0.12.1"
26-
hyper = { version = "1.6.0", features = ["full"] }
26+
http = "1.2.0"
2727
parking_lot = "0.12.1"
2828
prost.workspace = true
2929
rand.workspace = true
@@ -36,7 +36,7 @@ tokio.workspace = true
3636
tokio-stream.workspace = true
3737
tokio-tungstenite = "0.26.1"
3838
tonic.workspace = true
39-
tonic-reflection = "0.12.3"
39+
tonic-reflection.workspace = true
4040
tower = { version = "0.4.13", features = ["steer"] }
4141
tower-http = { version = "0.6.2", features = ["fs", "redirect", "trace"] }
4242
tracing.workspace = true

crates/sshx-server/src/listen.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::{fmt::Debug, future::Future, sync::Arc};
33
use anyhow::Result;
44
use axum::body::Body;
55
use axum::serve::Listener;
6-
use hyper::{header::CONTENT_TYPE, Request};
6+
use http::{header::CONTENT_TYPE, Request};
77
use sshx_core::proto::{sshx_service_server::SshxServiceServer, FILE_DESCRIPTOR_SET};
88
use tonic::service::Routes as TonicRoutes;
99
use tower::{make::Shared, steer::Steer, ServiceExt};

crates/sshx-server/tests/common/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::time::Duration;
66
use anyhow::{ensure, Result};
77
use axum::serve::ListenerExt;
88
use futures_util::{SinkExt, StreamExt};
9-
use hyper::StatusCode;
9+
use http::StatusCode;
1010
use sshx::encrypt::Encrypt;
1111
use sshx_core::proto::sshx_service_client::SshxServiceClient;
1212
use sshx_core::{Sid, Uid};

0 commit comments

Comments
 (0)