Skip to content

Commit

Permalink
Merge branch 'main' into toolchain-2024-07-21
Browse files Browse the repository at this point in the history
  • Loading branch information
@tautschnig
tautschnig authored Jul 22, 2024
2 parents 4b0ffd9 + 59371f3 commit 745d686
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
42 changes: 21 additions & 21 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand Down Expand Up @@ -482,7 +482,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand Down Expand Up @@ -801,9 +801,9 @@ dependencies = [

[[package]]
name = "redox_syscall"
version = "0.5.2"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
dependencies = [
"bitflags",
]
Expand Down Expand Up @@ -924,7 +924,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand Down Expand Up @@ -1030,7 +1030,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand All @@ -1045,9 +1045,9 @@ dependencies = [

[[package]]
name = "syn"
version = "2.0.71"
version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -1068,22 +1068,22 @@ dependencies = [

[[package]]
name = "thiserror"
version = "1.0.62"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]

[[package]]
name = "thiserror-impl"
version = "1.0.62"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand All @@ -1098,9 +1098,9 @@ dependencies = [

[[package]]
name = "toml"
version = "0.8.14"
version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
dependencies = [
"serde",
"serde_spanned",
Expand All @@ -1119,9 +1119,9 @@ dependencies = [

[[package]]
name = "toml_edit"
version = "0.22.15"
version = "0.22.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
dependencies = [
"indexmap",
"serde",
Expand Down Expand Up @@ -1149,7 +1149,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]

[[package]]
Expand Down Expand Up @@ -1384,9 +1384,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

[[package]]
name = "winnow"
version = "0.6.13"
version = "0.6.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f"
dependencies = [
"memchr",
]
Expand Down Expand Up @@ -1414,5 +1414,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.71",
"syn 2.0.72",
]
2 changes: 1 addition & 1 deletion tests/perf/s2n-quic
Submodule s2n-quic updated 89 files
+4 −2 dc/s2n-quic-dc/Cargo.toml
+1 −0 dc/s2n-quic-dc/src/clock.rs
+5 −0 dc/s2n-quic-dc/src/crypto.rs
+9 −1 dc/s2n-quic-dc/src/crypto/awslc.rs
+9 −1 dc/s2n-quic-dc/src/crypto/testing.rs
+1 −0 dc/s2n-quic-dc/src/datagram/tunneled/recv.rs
+3 −0 dc/s2n-quic-dc/src/lib.rs
+26 −0 dc/s2n-quic-dc/src/packet.rs
+23 −2 dc/s2n-quic-dc/src/packet/control.rs
+11 −1 dc/s2n-quic-dc/src/packet/control/decoder.rs
+9 −11 dc/s2n-quic-dc/src/packet/control/encoder.rs
+22 −6 dc/s2n-quic-dc/src/packet/datagram.rs
+16 −1 dc/s2n-quic-dc/src/packet/datagram/decoder.rs
+14 −3 dc/s2n-quic-dc/src/packet/datagram/encoder.rs
+1 −0 dc/s2n-quic-dc/src/packet/secret_control.rs
+2 −0 dc/s2n-quic-dc/src/packet/secret_control/decoder.rs
+4 −0 dc/s2n-quic-dc/src/packet/secret_control/replay_detected.rs
+4 −0 dc/s2n-quic-dc/src/packet/secret_control/stale_key.rs
+13 −4 dc/s2n-quic-dc/src/packet/secret_control/unknown_path_secret.rs
+26 −6 dc/s2n-quic-dc/src/packet/stream.rs
+24 −3 dc/s2n-quic-dc/src/packet/stream/decoder.rs
+16 −21 dc/s2n-quic-dc/src/packet/stream/encoder.rs
+32 −0 dc/s2n-quic-dc/src/packet/wire_version.rs
+12 −2 dc/s2n-quic-dc/src/path/secret/key.rs
+35 −11 dc/s2n-quic-dc/src/path/secret/map.rs
+2 −0 dc/s2n-quic-dc/src/path/secret/map/test.rs
+11 −8 dc/s2n-quic-dc/src/path/secret/stateless_reset.rs
+5 −0 dc/s2n-quic-dc/src/stream.rs
+151 −0 dc/s2n-quic-dc/src/stream/application.rs
+323 −0 dc/s2n-quic-dc/src/stream/endpoint.rs
+372 −0 dc/s2n-quic-dc/src/stream/environment.rs
+277 −0 dc/s2n-quic-dc/src/stream/environment/tokio.rs
+4 −840 dc/s2n-quic-dc/src/stream/recv.rs
+368 −0 dc/s2n-quic-dc/src/stream/recv/application.rs
+67 −0 dc/s2n-quic-dc/src/stream/recv/application/builder.rs
+18 −2 dc/s2n-quic-dc/src/stream/recv/error.rs
+11 −2 dc/s2n-quic-dc/src/stream/recv/packet.rs
+575 −0 dc/s2n-quic-dc/src/stream/recv/shared.rs
+30 −0 dc/s2n-quic-dc/src/stream/recv/snapshots/s2n_quic_dc__stream__recv__worker__waiting__dot_test.snap
+845 −0 dc/s2n-quic-dc/src/stream/recv/state.rs
+341 −0 dc/s2n-quic-dc/src/stream/recv/worker.rs
+15 −0 dc/s2n-quic-dc/src/stream/runtime.rs
+87 −0 dc/s2n-quic-dc/src/stream/runtime/tokio.rs
+1 −0 dc/s2n-quic-dc/src/stream/send.rs
+354 −137 dc/s2n-quic-dc/src/stream/send/application.rs
+33 −0 dc/s2n-quic-dc/src/stream/send/application/builder.rs
+174 −0 dc/s2n-quic-dc/src/stream/send/application/state.rs
+1 −1 dc/s2n-quic-dc/src/stream/send/application/transmission.rs
+5 −4 dc/s2n-quic-dc/src/stream/send/queue.rs
+1 −1 dc/s2n-quic-dc/src/stream/send/shared.rs
+15 −0 dc/s2n-quic-dc/src/stream/send/snapshots/s2n_quic_dc__stream__send__worker__waiting__dot_test.snap
+1,269 −0 dc/s2n-quic-dc/src/stream/send/state.rs
+0 −0 dc/s2n-quic-dc/src/stream/send/state/probe.rs
+0 −0 dc/s2n-quic-dc/src/stream/send/state/retransmission.rs
+0 −0 dc/s2n-quic-dc/src/stream/send/state/transmission.rs
+352 −1,142 dc/s2n-quic-dc/src/stream/send/worker.rs
+173 −0 dc/s2n-quic-dc/src/stream/shared.rs
+2 −1 dc/s2n-quic-dc/src/stream/socket.rs
+63 −53 dc/s2n-quic-dc/src/stream/socket/application/builder.rs
+1 −1 dc/s2n-quic-dc/src/stream/socket/tokio/tcp.rs
+9 −0 dc/s2n-quic-dc/src/testing.rs
+2 −0 dc/wireshark/src/bin/generate-pcap.rs
+26 −2 dc/wireshark/src/dissect.rs
+26 −8 dc/wireshark/src/field.rs
+16 −3 dc/wireshark/src/test.rs
+7 −1 dc/wireshark/src/value.rs
+1 −1 quic/s2n-quic-core/src/application/server_name.rs
+8 −0 quic/s2n-quic-core/src/connection/error.rs
+2 −0 quic/s2n-quic-core/src/dc/testing.rs
+4 −0 quic/s2n-quic-core/src/event/generated.rs
+1 −0 quic/s2n-quic-events/events/common.rs
+1 −0 quic/s2n-quic-transport/Cargo.toml
+69 −10 quic/s2n-quic-transport/src/connection/connection_container.rs
+65 −0 quic/s2n-quic-transport/src/connection/connection_id_mapper.rs
+10 −0 quic/s2n-quic-transport/src/connection/connection_impl.rs
+4 −1 quic/s2n-quic-transport/src/connection/mod.rs
+19 −1 quic/s2n-quic-transport/src/endpoint/connect.rs
+1 −0 quic/s2n-quic-transport/src/endpoint/initial.rs
+55 −0 quic/s2n-quic-transport/src/endpoint/mod.rs
+9 −1 quic/s2n-quic-transport/src/space/session_context.rs
+2 −2 quic/s2n-quic/Cargo.toml
+4 −0 quic/s2n-quic/src/provider/dc.rs
+150 −0 quic/s2n-quic/src/provider/dc/confirm.rs
+1 −0 quic/s2n-quic/src/provider/event/disabled.rs
+1 −0 quic/s2n-quic/src/tests.rs
+222 −46 quic/s2n-quic/src/tests/dc.rs
+129 −0 quic/s2n-quic/src/tests/deduplicate.rs
+13 −0 quic/s2n-quic/src/tests/recorder.rs
+3 −0 quic/s2n-quic/src/tests/skip_packets.rs

0 comments on commit 745d686

Please sign in to comment.