more merge work

This commit is contained in:
Jack Wright 2024-12-17 09:21:24 -08:00
parent 59c887f114
commit b7b4767f12

87
Cargo.lock generated
View File

@ -488,7 +488,7 @@ dependencies = [
"hex", "hex",
"hmac", "hmac",
"http 0.2.12", "http 0.2.12",
"http 1.1.0", "http 1.2.0",
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"sha2", "sha2",
@ -583,7 +583,7 @@ dependencies = [
"aws-smithy-types", "aws-smithy-types",
"bytes", "bytes",
"http 0.2.12", "http 0.2.12",
"http 1.1.0", "http 1.2.0",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tracing", "tracing",
@ -600,7 +600,7 @@ dependencies = [
"bytes", "bytes",
"bytes-utils", "bytes-utils",
"http 0.2.12", "http 0.2.12",
"http 1.1.0", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
@ -2252,8 +2252,6 @@ dependencies = [
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.4.6"
version = "0.4.6"
version = "0.4.7" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
@ -2263,7 +2261,7 @@ dependencies = [
"fnv", "fnv",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"http 1.1.0", "http 1.2.0",
"indexmap", "indexmap",
"slab", "slab",
"tokio", "tokio",
@ -2430,8 +2428,6 @@ dependencies = [
[[package]] [[package]]
name = "http" name = "http"
version = "1.1.0"
version = "1.1.0"
version = "1.2.0" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
@ -2459,7 +2455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [ dependencies = [
"bytes", "bytes",
"http 1.1.0", "http 1.2.0",
] ]
[[package]] [[package]]
@ -2470,7 +2466,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-util", "futures-util",
"http 1.1.0", "http 1.2.0",
"http-body 1.0.1", "http-body 1.0.1",
"pin-project-lite", "pin-project-lite",
] ]
@ -2531,8 +2527,6 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.5.0"
version = "1.5.0"
version = "1.5.1" version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
@ -2540,8 +2534,8 @@ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"h2 0.4.6", "h2 0.4.7",
"http 1.1.0", "http 1.2.0",
"http-body 1.0.1", "http-body 1.0.1",
"httparse", "httparse",
"httpdate", "httpdate",
@ -2575,14 +2569,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http 1.1.0", "http 1.2.0",
"hyper 1.5.0", "hyper 1.5.1",
"hyper-util", "hyper-util",
"rustls 0.23.19", "rustls 0.23.20",
"rustls-native-certs 0.8.1", "rustls-native-certs 0.8.1",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls 0.26.0", "tokio-rustls 0.26.1",
"tower-service", "tower-service",
] ]
@ -2595,9 +2589,9 @@ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"http 1.1.0", "http 1.2.0",
"http-body 1.0.1", "http-body 1.0.1",
"hyper 1.5.0", "hyper 1.5.1",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -3415,10 +3409,10 @@ dependencies = [
"assert-json-diff", "assert-json-diff",
"bytes", "bytes",
"futures-util", "futures-util",
"http 1.1.0", "http 1.2.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.5.0", "hyper 1.5.1",
"hyper-util", "hyper-util",
"log", "log",
"rand", "rand",
@ -4514,7 +4508,7 @@ dependencies = [
"chrono", "chrono",
"futures", "futures",
"humantime", "humantime",
"hyper 1.5.0", "hyper 1.5.1",
"itertools 0.13.0", "itertools 0.13.0",
"md-5", "md-5",
"parking_lot", "parking_lot",
@ -5810,12 +5804,8 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"quinn-proto", "quinn-proto",
"quinn-udp", "quinn-udp",
"rustc-hash 2.0.0",
"rustls 0.23.19",
"rustc-hash 2.0.0",
"rustls",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustls", "rustls 0.23.20",
"socket2", "socket2",
"thiserror 2.0.6", "thiserror 2.0.6",
"tokio", "tokio",
@ -5832,12 +5822,8 @@ dependencies = [
"getrandom", "getrandom",
"rand", "rand",
"ring", "ring",
"rustc-hash 2.0.0",
"rustls 0.23.19",
"rustc-hash 2.0.0",
"rustls",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustls", "rustls 0.23.20",
"rustls-pki-types", "rustls-pki-types",
"slab", "slab",
"thiserror 2.0.6", "thiserror 2.0.6",
@ -6118,11 +6104,11 @@ dependencies = [
"bytes", "bytes",
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2 0.4.6", "h2 0.4.7",
"http 1.1.0", "http 1.2.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.5.0", "hyper 1.5.1",
"hyper-rustls 0.27.3", "hyper-rustls 0.27.3",
"hyper-util", "hyper-util",
"ipnet", "ipnet",
@ -6133,7 +6119,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"quinn", "quinn",
"rustls 0.23.19", "rustls 0.23.20",
"rustls-native-certs 0.8.1", "rustls-native-certs 0.8.1",
"rustls-pemfile 2.2.0", "rustls-pemfile 2.2.0",
"rustls-pki-types", "rustls-pki-types",
@ -6142,7 +6128,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper",
"tokio", "tokio",
"tokio-rustls 0.26.0", "tokio-rustls 0.26.1",
"tokio-util", "tokio-util",
"tower-service", "tower-service",
"url", "url",
@ -6398,6 +6384,18 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "rustls"
version = "0.21.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
dependencies = [
"log",
"ring",
"rustls-webpki 0.101.7",
"sct",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.20" version = "0.23.20"
@ -7473,14 +7471,23 @@ dependencies = [
"syn 2.0.90", "syn 2.0.90",
] ]
[[package]]
name = "tokio-rustls"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.21.12",
"tokio",
]
[[package]] [[package]]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.26.1" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
dependencies = [ dependencies = [
"rustls", "rustls 0.23.20",
"rustls-pki-types",
"tokio", "tokio",
] ]