Merge branch 'main' into list-subcommand

carolynzech · Oct 1, 2024 · a2a5082 · a2a5082
2 parents b5f48a1 + 10b8a9d
commit a2a5082
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ahash"
@@ -81,9 +81,9 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -597,9 +597,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "linear-map"
@@ -754,9 +754,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "os_info"
@@ -819,6 +822,12 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -926,23 +935,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -956,13 +965,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -973,9 +982,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-demangle"
@@ -1079,9 +1088,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -1185,9 +1194,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1196,9 +1205,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1300,9 +1309,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.21"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
@@ -1586,9 +1595,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2024-09-26"
+channel = "nightly-2024-10-01"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tests/perf/s2n-quic b/tests/perf/s2n-quic
+1 −1		.github/workflows/ci.yml
+7 −1		common/s2n-codec/Cargo.toml
+0 −1		common/s2n-codec/src/lib.rs
+11 −4		dc/s2n-quic-dc/Cargo.toml
+1 −1		dc/s2n-quic-dc/benches/Cargo.toml
+2 −0		dc/s2n-quic-dc/benches/src/crypto.rs
+32 −0		dc/s2n-quic-dc/benches/src/crypto/hmac.rs
+10 −0		dc/s2n-quic-dc/src/event/events.rs
+594 −0		dc/s2n-quic-dc/src/event/generated.rs
+170 −0		dc/s2n-quic-dc/src/fixed_map.rs
+33 −0		dc/s2n-quic-dc/src/fixed_map/test.rs
+1 −2		dc/s2n-quic-dc/src/lib.rs
+99 −96		dc/s2n-quic-dc/src/path/secret/map.rs
+44 −22		dc/s2n-quic-dc/src/path/secret/map/test.rs
+32 −0		dc/s2n-quic-dc/src/path/secret/receiver.rs
+24 −0		dc/s2n-quic-dc/src/path/secret/schedule.rs
+16 −5		dc/s2n-quic-dc/src/path/secret/sender.rs
+1 −1		quic/s2n-quic-bench/Cargo.toml
+13 −2		quic/s2n-quic-core/Cargo.toml
+1 −0		quic/s2n-quic-core/src/event.rs
+697 −0		quic/s2n-quic-core/src/event/generated.rs
+13 −0		quic/s2n-quic-core/src/event/metrics.rs
+0 −1		quic/s2n-quic-core/src/lib.rs
+4 −9		quic/s2n-quic-crypto/Cargo.toml
+1 −1		quic/s2n-quic-crypto/src/aead/default.rs
+2 −2		quic/s2n-quic-crypto/src/aead/fips.rs
+2 −2		quic/s2n-quic-crypto/src/cipher_suite.rs
+2 −1		quic/s2n-quic-crypto/src/cipher_suite/negotiated.rs
+2 −2		quic/s2n-quic-crypto/src/cipher_suite/ring.rs
+1 −1		quic/s2n-quic-crypto/src/header_key.rs
+1 −1		quic/s2n-quic-crypto/src/iv.rs
+2 −5		quic/s2n-quic-crypto/src/lib.rs
+5 −5		quic/s2n-quic-crypto/src/negotiated.rs
+1 −1		quic/s2n-quic-crypto/src/retry.rs
+460 −183		quic/s2n-quic-events/src/main.rs
+55 −26		quic/s2n-quic-events/src/parser.rs
+20 −3		quic/s2n-quic-platform/Cargo.toml
+91 −25		quic/s2n-quic-platform/build.rs
+0 −1		quic/s2n-quic-platform/src/lib.rs
+7 −0		quic/s2n-quic-qns/Cargo.toml
+0 −2		quic/s2n-quic-qns/src/main.rs
+4 −4		quic/s2n-quic-rustls/Cargo.toml
+4 −4		quic/s2n-quic-tls-default/Cargo.toml
+10 −4		quic/s2n-quic-tls/Cargo.toml
+1 −1		quic/s2n-quic-tls/src/callback.rs
+0 −2		quic/s2n-quic-tls/src/lib.rs
+10 −3		quic/s2n-quic-transport/Cargo.toml
+0 −1		quic/s2n-quic-transport/src/lib.rs
+9 −9		quic/s2n-quic/Cargo.toml
+1 −1		rust-toolchain
+3 −3		tools/xdp/s2n-quic-xdp/Cargo.toml