Skip to content

Commit b4bf601

Browse files
ghedokornelski
authored andcommitted
Remove support for Hyper v0
1 parent c3f33f0 commit b4bf601

File tree

8 files changed

+7
-530
lines changed

8 files changed

+7
-530
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,5 +371,3 @@ jobs:
371371
name: Run `rpk,underscore-wildcards` tests
372372
- run: cargo test --features pq-experimental,rpk,underscore-wildcards
373373
name: Run `pq-experimental,rpk,underscore-wildcards` tests
374-
- run: cargo test -p hyper-boring --features hyper1
375-
name: Run hyper 1.0 tests for hyper-boring

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ anyhow = "1"
4040
antidote = "1.0.0"
4141
http = "1"
4242
http-body-util = "0.1.2"
43-
http_old = { package = "http", version = "0.2" }
4443
hyper = "1"
4544
hyper-util = "0.1.6"
46-
hyper_old = { package = "hyper", version = "0.14", default-features = false }
4745
linked_hash_set = "0.1"
4846
openssl-macros = "0.1.1"
4947
tower = "0.4"

hyper-boring/Cargo.toml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ features = ["pq-experimental"]
1616
rustdoc-args = ["--cfg", "docsrs"]
1717

1818
[features]
19-
default = ["runtime"]
20-
21-
runtime = ["hyper_old/runtime"]
22-
2319
# Use a FIPS-validated version of boringssl.
2420
fips = ["tokio-boring/fips"]
2521

@@ -39,29 +35,23 @@ fips-link-precompiled = ["tokio-boring/fips-link-precompiled"]
3935
# Enables experimental post-quantum crypto (https://blog.cloudflare.com/post-quantum-for-all/)
4036
pq-experimental = ["tokio-boring/pq-experimental"]
4137

42-
# Enable Hyper 1 support
43-
hyper1 = ["dep:http", "dep:hyper", "dep:hyper-util", "dep:tower-service"]
44-
4538
[dependencies]
4639
antidote = { workspace = true }
47-
http = { workspace = true, optional = true }
48-
http_old = { workspace = true }
49-
hyper = { workspace = true, optional = true }
50-
hyper-util = { workspace = true, optional = true, features = ["client", "client-legacy"] }
51-
hyper_old = { workspace = true, features = ["client"] }
40+
http = { workspace = true }
41+
hyper = { workspace = true }
42+
hyper-util = { workspace = true, features = ["client", "client-legacy"] }
5243
linked_hash_set = { workspace = true }
5344
boring = { workspace = true }
5445
tokio = { workspace = true }
5546
tokio-boring = { workspace = true }
5647
tower-layer = { workspace = true }
57-
tower-service = { workspace = true, optional = true }
48+
tower-service = { workspace = true }
5849

5950
[dev-dependencies]
6051
bytes = { workspace = true }
6152
http-body-util = { workspace = true }
6253
hyper-util = { workspace = true, features = ["http1", "http2", "service", "tokio"] }
6354
hyper = { workspace = true, features = ["server"] }
64-
hyper_old = { workspace = true, features = [ "full" ] }
6555
tokio = { workspace = true, features = [ "full" ] }
6656
tower = { workspace = true, features = ["util"] }
6757
futures = { workspace = true }

hyper-boring/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ use std::sync::LazyLock;
1111
use tokio_boring::SslStream;
1212

1313
mod cache;
14-
mod v0;
15-
/// Hyper 1 support.
16-
#[cfg(feature = "hyper1")]
17-
pub mod v1;
14+
mod v1;
1815

19-
pub use self::v0::*;
16+
pub use self::v1::*;
2017

2118
fn key_index() -> Result<Index<Ssl, SessionKey>, ErrorStack> {
2219
static IDX: LazyLock<Index<Ssl, SessionKey>> = LazyLock::new(|| Ssl::new_ex_index().unwrap());

0 commit comments

Comments
 (0)