Unverified Commit 21c6cc7e authored by Zelda Hessler's avatar Zelda Hessler Committed by GitHub
Browse files

Make `http` v0 usage more evident (#3711) 

Also fixes IntelliJ lints

This PR is not intended to change any behavior. If you see me doing that
somewhere, then it's a mistake.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 31a4b8e6

aws/rust-runtime/Cargo.lock

+5 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ dependencies = [ 


[[package]]

name = "aws-runtime"

version = "1.3.0"

version = "1.3.1"

dependencies = [

 "arbitrary",

 "aws-credential-types",
@@ -166,7 +166,9 @@ dependencies = [ 
 "fastrand",

 "futures-util",

 "http 0.2.12",

 "http 1.1.0",

 "http-body 0.4.6",

 "http-body 1.0.0",

 "percent-encoding",

 "pin-project-lite",

 "proptest",
@@ -262,7 +264,7 @@ dependencies = [ 


[[package]]

name = "aws-smithy-http"

version = "0.60.8"

version = "0.60.9"

dependencies = [

 "aws-smithy-runtime-api",

 "aws-smithy-types",
@@ -319,7 +321,7 @@ dependencies = [ 


[[package]]

name = "aws-smithy-runtime-api"

version = "1.7.0"

version = "1.7.1"

dependencies = [

 "aws-smithy-async",

 "aws-smithy-types",

aws/rust-runtime/aws-config/Cargo.lock

+284 −58
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ dependencies = [ 


[[package]]

name = "aws-runtime"

version = "1.3.0"

version = "1.2.3"

dependencies = [

 "aws-credential-types",

 "aws-sigv4",
@@ -172,7 +172,7 @@ dependencies = [ 


[[package]]

name = "aws-sigv4"

version = "1.2.3"

version = "1.2.2"

dependencies = [

 "aws-credential-types",

 "aws-smithy-http",
@@ -249,7 +249,7 @@ dependencies = [ 


[[package]]

name = "aws-smithy-runtime"

version = "1.6.1"

version = "1.6.0"

dependencies = [

 "aws-smithy-async",

 "aws-smithy-http",
@@ -322,21 +322,22 @@ dependencies = [ 


[[package]]

name = "aws-types"

version = "1.3.3"

version = "1.3.1"

dependencies = [

 "aws-credential-types",

 "aws-smithy-async",

 "aws-smithy-runtime-api",

 "aws-smithy-types",

 "http 0.2.12",

 "rustc_version",

 "tracing",

]



[[package]]

name = "backtrace"

version = "0.3.73"

version = "0.3.72"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"

checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"

dependencies = [

 "addr2line",

 "cc",
@@ -467,6 +468,17 @@ dependencies = [ 
 "subtle",

]



[[package]]

name = "displaydoc"

version = "0.2.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

]



[[package]]

name = "either"

version = "1.12.0"
@@ -682,9 +694,9 @@ dependencies = [ 


[[package]]

name = "httparse"

version = "1.9.4"

version = "1.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"

checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"



[[package]]

name = "httpdate"
@@ -733,14 +745,134 @@ dependencies = [ 
 "webpki-roots",

]



[[package]]

name = "icu_collections"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"

dependencies = [

 "displaydoc",

 "yoke",

 "zerofrom",

 "zerovec",

]



[[package]]

name = "icu_locid"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"

dependencies = [

 "displaydoc",

 "litemap",

 "tinystr",

 "writeable",

 "zerovec",

]



[[package]]

name = "icu_locid_transform"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"

dependencies = [

 "displaydoc",

 "icu_locid",

 "icu_locid_transform_data",

 "icu_provider",

 "tinystr",

 "zerovec",

]



[[package]]

name = "icu_locid_transform_data"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"



[[package]]

name = "icu_normalizer"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"

dependencies = [

 "displaydoc",

 "icu_collections",

 "icu_normalizer_data",

 "icu_properties",

 "icu_provider",

 "smallvec",

 "utf16_iter",

 "utf8_iter",

 "write16",

 "zerovec",

]



[[package]]

name = "icu_normalizer_data"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"



[[package]]

name = "icu_properties"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"

dependencies = [

 "displaydoc",

 "icu_collections",

 "icu_locid_transform",

 "icu_properties_data",

 "icu_provider",

 "tinystr",

 "zerovec",

]



[[package]]

name = "icu_properties_data"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"



[[package]]

name = "icu_provider"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"

dependencies = [

 "displaydoc",

 "icu_locid",

 "icu_provider_macros",

 "stable_deref_trait",

 "tinystr",

 "writeable",

 "yoke",

 "zerofrom",

 "zerovec",

]



[[package]]

name = "icu_provider_macros"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

]



[[package]]

name = "idna"

version = "0.5.0"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"

checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"

dependencies = [

 "unicode-bidi",

 "unicode-normalization",

 "icu_normalizer",

 "icu_properties",

 "smallvec",

 "utf8_iter",

]



[[package]]
@@ -772,6 +904,12 @@ version = "0.2.155" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"



[[package]]

name = "litemap"

version = "0.7.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"



[[package]]

name = "lock_api"

version = "0.4.12"
@@ -799,15 +937,15 @@ dependencies = [ 


[[package]]

name = "memchr"

version = "2.7.4"

version = "2.7.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"



[[package]]

name = "miniz_oxide"

version = "0.7.4"

version = "0.7.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"

checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"

dependencies = [

 "adler",

]
@@ -869,9 +1007,9 @@ dependencies = [ 


[[package]]

name = "object"

version = "0.36.0"

version = "0.35.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"

checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"

dependencies = [

 "memchr",

]
@@ -983,9 +1121,9 @@ dependencies = [ 


[[package]]

name = "proc-macro2"

version = "1.0.86"

version = "1.0.85"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"

checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"

dependencies = [

 "unicode-ident",

]
@@ -1001,9 +1139,9 @@ dependencies = [ 


[[package]]

name = "redox_syscall"

version = "0.5.2"

version = "0.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"

checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"

dependencies = [

 "bitflags",

]
@@ -1217,7 +1355,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.67",

 "syn 2.0.66",

]



[[package]]
@@ -1292,11 +1430,17 @@ version = "0.9.8" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"



[[package]]

name = "stable_deref_trait"

version = "1.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"



[[package]]

name = "subtle"

version = "2.6.0"

version = "2.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"

checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"



[[package]]

name = "syn"
@@ -1311,15 +1455,26 @@ dependencies = [ 


[[package]]

name = "syn"

version = "2.0.67"

version = "2.0.66"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"

checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "synstructure"

version = "0.13.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

]



[[package]]

name = "thiserror"

version = "1.0.61"
@@ -1337,7 +1492,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.67",

 "syn 2.0.66",

]



[[package]]
@@ -1381,20 +1536,15 @@ dependencies = [ 
]



[[package]]

name = "tinyvec"

version = "1.6.0"

name = "tinystr"

version = "0.7.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"

checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"

dependencies = [

 "tinyvec_macros",

 "displaydoc",

 "zerovec",

]



[[package]]

name = "tinyvec_macros"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"



[[package]]

name = "tokio"

version = "1.38.0"
@@ -1422,7 +1572,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.67",

 "syn 2.0.66",

]



[[package]]
@@ -1473,7 +1623,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.67",

 "syn 2.0.66",

]



[[package]]
@@ -1546,7 +1696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"

dependencies = [

 "quote",

 "syn 2.0.67",

 "syn 2.0.66",

]



[[package]]
@@ -1561,27 +1711,12 @@ version = "1.17.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"



[[package]]

name = "unicode-bidi"

version = "0.3.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"



[[package]]

name = "unicode-ident"

version = "1.0.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"



[[package]]

name = "unicode-normalization"

version = "0.1.23"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"

dependencies = [

 "tinyvec",

]



[[package]]

name = "untrusted"

version = "0.9.0"
@@ -1590,9 +1725,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" 


[[package]]

name = "url"

version = "2.5.2"

version = "2.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"

checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"

dependencies = [

 "form_urlencoded",

 "idna",
@@ -1605,6 +1740,18 @@ version = "2.1.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"



[[package]]

name = "utf16_iter"

version = "1.0.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"



[[package]]

name = "utf8_iter"

version = "1.0.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"



[[package]]

name = "uuid"

version = "1.8.0"
@@ -1811,6 +1958,18 @@ version = "0.52.5" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"



[[package]]

name = "write16"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"



[[package]]

name = "writeable"

version = "0.5.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"



[[package]]

name = "xmlparser"

version = "0.13.6"
@@ -1823,8 +1982,75 @@ version = "0.5.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"



[[package]]

name = "yoke"

version = "0.7.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"

dependencies = [

 "serde",

 "stable_deref_trait",

 "yoke-derive",

 "zerofrom",

]



[[package]]

name = "yoke-derive"

version = "0.7.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

 "synstructure",

]



[[package]]

name = "zerofrom"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"

dependencies = [

 "zerofrom-derive",

]



[[package]]

name = "zerofrom-derive"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

 "synstructure",

]



[[package]]

name = "zeroize"

version = "1.8.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"



[[package]]

name = "zerovec"

version = "0.10.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"

dependencies = [

 "yoke",

 "zerofrom",

 "zerovec-derive",

]



[[package]]

name = "zerovec-derive"

version = "0.10.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.66",

]

aws/rust-runtime/aws-runtime/Cargo.toml

+6 −3
Original line number Diff line number Diff line 
[package]

name = "aws-runtime"

version = "1.3.0"

version = "1.3.1"

authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>"]

description = "Runtime support code for the AWS SDK. This crate isn't intended to be used directly."

edition = "2021"
@@ -10,6 +10,7 @@ repository = "https://github.com/smithy-lang/smithy-rs" 
[features]

event-stream = ["dep:aws-smithy-eventstream", "aws-sigv4/sign-eventstream"]

http-02x = []

http-1x = ["dep:http-1x", "dep:http-body-1x"]

test-util = []

sigv4a = ["aws-sigv4/sigv4a"]
@@ -25,8 +26,10 @@ aws-smithy-types = { path = "../../../rust-runtime/aws-smithy-types" } 
aws-types = { path = "../aws-types" }

bytes = "1.1"

fastrand = "2.0.0"

http = "0.2.3"

http-body = "0.4.5"

http-02x = { package = "http", version = "0.2.3" }

http-body-04x = { package = "http-body", version = "0.4.5" }

http-1x = { package = "http", version = "1.1.0", optional = true }

http-body-1x = { package = "http-body", version = "1.0.0", optional = true }

percent-encoding = "2.1.0"

pin-project-lite = "0.2.9"

tracing = "0.1"

aws/rust-runtime/aws-runtime/src/auth.rs

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ fn apply_signing_instructions( 
) -> Result<(), BoxError> {

    let (new_headers, new_query) = instructions.into_parts();

    for header in new_headers.into_iter() {

        let mut value = http::HeaderValue::from_str(header.value()).unwrap();

        let mut value = http_02x::HeaderValue::from_str(header.value()).unwrap();

        value.set_sensitive(header.sensitive());

        request.headers_mut().insert(header.name(), value);

    }

aws/rust-runtime/aws-runtime/src/content_encoding.rs

+4 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
 */



use bytes::{Bytes, BytesMut};

use http::{HeaderMap, HeaderValue};

use http_body::{Body, SizeHint};

use http_02x::{HeaderMap, HeaderValue};

use http_body_04x::{Body, SizeHint};

use pin_project_lite::pin_project;



use std::pin::Pin;
@@ -357,8 +357,8 @@ mod tests { 
    use aws_smithy_types::body::SdkBody;

    use bytes::{Buf, Bytes};

    use bytes_utils::SegmentedBuf;

    use http::{HeaderMap, HeaderValue};

    use http_body::{Body, SizeHint};

    use http_02x::{HeaderMap, HeaderValue};

    use http_body_04x::{Body, SizeHint};

    use pin_project_lite::pin_project;



    use std::io::Read;