Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 2023-09-13 #107

Merged
merged 7 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
Expand Down
6 changes: 3 additions & 3 deletions crates/hring-bingo-ktls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ 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" }
socket2 = "0.5.3"

[target.'cfg(target_os = "linux")'.dependencies]
ktls = "3.0.0"
ktls = "2.0.0"
2 changes: 1 addition & 1 deletion crates/hring-h2spec/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion crates/hring-hpack/src/huffman.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-06-14"
components = ["llvm-tools-preview"]
channel = "nightly-2023-09-13"
components = ["llvm-tools-preview"]
Loading