From dac95c6661685f002c9e308d33f98a20536c82d4 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Tue, 12 Sep 2023 14:52:41 +0200 Subject: [PATCH 1/7] Upgrade to 2023-09-12 --- crates/hring-h2spec/src/main.rs | 2 +- rust-toolchain.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/hring-h2spec/src/main.rs b/crates/hring-h2spec/src/main.rs index 7c0e1198..9f8f4941 100644 --- a/crates/hring-h2spec/src/main.rs +++ b/crates/hring-h2spec/src/main.rs @@ -71,7 +71,7 @@ struct TestBody { } impl TestBody { - const CONTENTS: &str = "I am a test body"; + const CONTENTS: &'static str = "I am a test body"; } impl Body for TestBody { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 817ffbb3..c184001f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-06-14" -components = ["llvm-tools-preview"] \ No newline at end of file +channel = "nightly-2023-09-12" +components = ["llvm-tools-preview"] From 197020569a7986cb0f5b3055e1094fb3ce266078 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Tue, 12 Sep 2023 16:25:48 +0200 Subject: [PATCH 2/7] ktls 3.0.0 was yanked, use 2.0.0 --- crates/hring-bingo-ktls/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/hring-bingo-ktls/Cargo.toml b/crates/hring-bingo-ktls/Cargo.toml index f6dde171..30acf5c0 100644 --- a/crates/hring-bingo-ktls/Cargo.toml +++ b/crates/hring-bingo-ktls/Cargo.toml @@ -18,4 +18,4 @@ maybe-uring = { version = "0.1.0", path = "../maybe-uring" } socket2 = "0.5.3" [target.'cfg(target_os = "linux")'.dependencies] -ktls = "3.0.0" +ktls = "2.0.0" From aa9413cb4cb0c01d5d8eea5e6a5ef1bcc35b04cc Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Tue, 12 Sep 2023 16:39:25 +0200 Subject: [PATCH 3/7] Downgrade tokio-rustls + rustls while waiting for a new ktls release --- crates/hring-bingo-ktls/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/hring-bingo-ktls/Cargo.toml b/crates/hring-bingo-ktls/Cargo.toml index 30acf5c0..e9a9f852 100644 --- a/crates/hring-bingo-ktls/Cargo.toml +++ b/crates/hring-bingo-ktls/Cargo.toml @@ -9,9 +9,9 @@ hring = { path = "../hring" } rcgen = "0.10.0" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -rustls = { version = "0.21.1", features = ["secret_extraction"] } +rustls = { version = "0.20.9", features = ["secret_extraction"] } tokio = { version = "1.28.2", features = ["full"] } -tokio-rustls = "0.24.1" +tokio-rustls = "0.23.4" http = "0.2.9" pretty-hex = "0.3.0" maybe-uring = { version = "0.1.0", path = "../maybe-uring" } From bdb8f00903c1d2f588718ba1cc74abde059c0003 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Tue, 12 Sep 2023 16:42:13 +0200 Subject: [PATCH 4/7] Apply one clippy lint, the other is wrong --- crates/hring-hpack/src/huffman.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/hring-hpack/src/huffman.rs b/crates/hring-hpack/src/huffman.rs index 02f07d4c..10ceff75 100644 --- a/crates/hring-hpack/src/huffman.rs +++ b/crates/hring-hpack/src/huffman.rs @@ -63,7 +63,7 @@ impl HuffmanDecoder { for (symbol, &(code, code_len)) in table.iter().enumerate() { decoder_table .entry(code_len) - .or_insert_with(Default::default); + .or_default(); let subtable = decoder_table.get_mut(&code_len).unwrap(); let huff_symbol = HuffmanCodeSymbol::new(symbol); if let HuffmanCodeSymbol::EndOfString = huff_symbol { From a2ffb643447b1e4bcdb673f3837b67cf3e02a19c Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Wed, 13 Sep 2023 11:39:17 +0200 Subject: [PATCH 5/7] Upgrade to 2023-09-13 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c184001f..8059205a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-09-12" +channel = "nightly-2023-09-13" components = ["llvm-tools-preview"] From d1fdbd977735eb16ca4814249a158dc364a33e0d Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Wed, 13 Sep 2023 12:13:50 +0200 Subject: [PATCH 6/7] Fail if we can't download h2spec --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fef0d8a..abe8efb6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -90,7 +90,7 @@ jobs: # (pushd tools && curl -L https://github.com/summerwind/h2spec/releases/download/v2.6.0/h2spec_linux_amd64.tar.gz | tar -xz && popd) # Uses https://github.com/summerwind/h2spec/pull/123, more precisely # https://github.com/fasterthanlime/h2spec/commit/72a6b9b2b01133d292bd74e019fde86c3638094a - (pushd tools && curl -L http://misc.fasterthanli.me.s3.amazonaws.com/h2spec -o h2spec && chmod +x h2spec && popd) + (pushd tools && curl -fL http://misc.fasterthanli.me.s3.amazonaws.com/h2spec -o h2spec && chmod +x h2spec && popd) just ci-test sccache --show-stats - name: Upload h2spec Report From a97f63e606bc049505b9c2d8e83fa4886b240ad9 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Wed, 13 Sep 2023 14:01:19 +0200 Subject: [PATCH 7/7] Download h2spec from https://github.com/hapsoc/h2spec-binaries --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abe8efb6..df12cab3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -90,7 +90,7 @@ jobs: # (pushd tools && curl -L https://github.com/summerwind/h2spec/releases/download/v2.6.0/h2spec_linux_amd64.tar.gz | tar -xz && popd) # Uses https://github.com/summerwind/h2spec/pull/123, more precisely # https://github.com/fasterthanlime/h2spec/commit/72a6b9b2b01133d292bd74e019fde86c3638094a - (pushd tools && curl -fL http://misc.fasterthanli.me.s3.amazonaws.com/h2spec -o h2spec && chmod +x h2spec && popd) + (pushd tools && curl -fL https://github.com/hapsoc/h2spec-binaries/releases/download/72a6b9b/h2spec -o h2spec && chmod +x h2spec && popd) just ci-test sccache --show-stats - name: Upload h2spec Report