Skip to content

Commit

Permalink
chore: remove expicit hyper dependency
Browse files Browse the repository at this point in the history
We're no longer depending on `hyper` directly in any way after the 1.0 upgrade, so replace it with the `http` library instead.
  • Loading branch information
ekzhang committed Feb 12, 2025
1 parent 8a47723 commit 6b0e0ae
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ sshx-core = { version = "0.4.0", path = "crates/sshx-core" }
tokio = { version = "1.40.0", features = ["full"] }
tokio-stream = { version = "0.1.14", features = ["sync"] }
tonic = { version = "0.12.3", features = ["tls", "tls-webpki-roots"] }
tonic-build = "0.12.3"
tonic-reflection = "0.12.3"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/sshx-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ serde.workspace = true
tonic.workspace = true

[build-dependencies]
tonic-build = "0.12.3"
tonic-build.workspace = true
4 changes: 2 additions & 2 deletions crates/sshx-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ deadpool = "0.12.2"
deadpool-redis = "0.18.0"
futures-util = { version = "0.3.28", features = ["sink"] }
hmac = "0.12.1"
hyper = { version = "1.6.0", features = ["full"] }
http = "1.2.0"
parking_lot = "0.12.1"
prost.workspace = true
rand.workspace = true
Expand All @@ -36,7 +36,7 @@ tokio.workspace = true
tokio-stream.workspace = true
tokio-tungstenite = "0.26.1"
tonic.workspace = true
tonic-reflection = "0.12.3"
tonic-reflection.workspace = true
tower = { version = "0.4.13", features = ["steer"] }
tower-http = { version = "0.6.2", features = ["fs", "redirect", "trace"] }
tracing.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/sshx-server/src/listen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{fmt::Debug, future::Future, sync::Arc};
use anyhow::Result;
use axum::body::Body;
use axum::serve::Listener;
use hyper::{header::CONTENT_TYPE, Request};
use http::{header::CONTENT_TYPE, Request};
use sshx_core::proto::{sshx_service_server::SshxServiceServer, FILE_DESCRIPTOR_SET};
use tonic::service::Routes as TonicRoutes;
use tower::{make::Shared, steer::Steer, ServiceExt};
Expand Down
2 changes: 1 addition & 1 deletion crates/sshx-server/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::time::Duration;
use anyhow::{ensure, Result};
use axum::serve::ListenerExt;
use futures_util::{SinkExt, StreamExt};
use hyper::StatusCode;
use http::StatusCode;
use sshx::encrypt::Encrypt;
use sshx_core::proto::sshx_service_client::SshxServiceClient;
use sshx_core::{Sid, Uid};
Expand Down

0 comments on commit 6b0e0ae

Please sign in to comment.