diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ee71de590..0723f9c20f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ on: required: false env: - rust_version: 1.78.0 + rust_version: 1.81.0 rust_toolchain_components: clippy,rustfmt ENCRYPTED_DOCKER_PASSWORD: ${{ secrets.ENCRYPTED_DOCKER_PASSWORD }} DOCKER_LOGIN_TOKEN_PASSPHRASE: ${{ secrets.DOCKER_LOGIN_TOKEN_PASSPHRASE }} diff --git a/.github/workflows/claim-crate-names.yml b/.github/workflows/claim-crate-names.yml index 44a2eda8c6..bc98bb09b2 100644 --- a/.github/workflows/claim-crate-names.yml +++ b/.github/workflows/claim-crate-names.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true env: - rust_version: 1.78.0 + rust_version: 1.81.0 name: Claim unpublished crate names on crates.io run-name: ${{ github.workflow }} diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 4e31356cd8..8cb7304210 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -8,7 +8,7 @@ on: name: Update GitHub Pages env: - rust_version: 1.78.0 + rust_version: 1.81.0 # Allow only one doc pages build to run at a time for the entire smithy-rs repo concurrency: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 114443656e..af429fe758 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true env: - rust_version: 1.78.0 + rust_version: 1.81.0 name: Release smithy-rs on: diff --git a/.github/workflows/update-sdk-next.yml b/.github/workflows/update-sdk-next.yml index 5f317a7148..b5c0953933 100644 --- a/.github/workflows/update-sdk-next.yml +++ b/.github/workflows/update-sdk-next.yml @@ -45,7 +45,7 @@ jobs: - name: Set up Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.78.0 + toolchain: 1.81.0 - name: Delete old SDK run: | - name: Generate a fresh SDK diff --git a/aws/rust-runtime/Cargo.lock b/aws/rust-runtime/Cargo.lock index 393c20dd41..5841caf232 100644 --- a/aws/rust-runtime/Cargo.lock +++ b/aws/rust-runtime/Cargo.lock @@ -138,7 +138,7 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.0" +version = "1.5.1" dependencies = [ "arbitrary", "aws-credential-types", @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.1" +version = "1.2.2" dependencies = [ "futures-util", "pin-project-lite", @@ -292,7 +292,7 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.4" +version = "1.7.5" dependencies = [ "aws-smithy-async", "aws-smithy-http", diff --git a/aws/rust-runtime/aws-config/Cargo.lock b/aws/rust-runtime/aws-config/Cargo.lock index 7fd03a2396..f31a921e10 100644 --- a/aws/rust-runtime/aws-config/Cargo.lock +++ b/aws/rust-runtime/aws-config/Cargo.lock @@ -45,7 +45,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.10" +version = "1.5.11" dependencies = [ "aws-credential-types", "aws-runtime", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.0" +version = "1.5.1" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -106,6 +106,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "regex-lite", "tracing", "uuid", ] @@ -194,7 +195,7 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.1" +version = "1.2.2" dependencies = [ "futures-util", "pin-project-lite", diff --git a/aws/rust-runtime/aws-config/Cargo.toml b/aws/rust-runtime/aws-config/Cargo.toml index f94af92963..bfdcc62d57 100644 --- a/aws/rust-runtime/aws-config/Cargo.toml +++ b/aws/rust-runtime/aws-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-config" -version = "1.5.10" +version = "1.5.11" authors = [ "AWS Rust SDK Team ", "Russell Cohen ", @@ -19,6 +19,7 @@ default = ["client-hyper", "rustls", "rt-tokio", "credentials-process", "sso"] rt-tokio = ["aws-smithy-async/rt-tokio", "aws-smithy-runtime/rt-tokio", "tokio/rt"] rustls = ["aws-smithy-runtime/tls-rustls", "client-hyper"] sso = ["dep:aws-sdk-sso", "dep:aws-sdk-ssooidc", "dep:ring", "dep:hex", "dep:zeroize", "aws-smithy-runtime-api/http-auth"] +test-util = ["aws-runtime/test-util"] # deprecated: this feature does nothing allow-compilation = [] diff --git a/aws/rust-runtime/aws-config/src/default_provider/credentials.rs b/aws/rust-runtime/aws-config/src/default_provider/credentials.rs index 809a23dfe5..db676fe43d 100644 --- a/aws/rust-runtime/aws-config/src/default_provider/credentials.rs +++ b/aws/rust-runtime/aws-config/src/default_provider/credentials.rs @@ -316,7 +316,7 @@ mod test { #[cfg(all(feature = "sso", not(windows)))] make_test!(sso_no_token_file); - #[cfg(feature = "credentials-sso")] + #[cfg(feature = "sso")] make_test!(e2e_fips_and_dual_stack_sso); #[tokio::test] diff --git a/aws/rust-runtime/aws-config/src/ecs.rs b/aws/rust-runtime/aws-config/src/ecs.rs index fc7e8ad290..ef3da3aa1d 100644 --- a/aws/rust-runtime/aws-config/src/ecs.rs +++ b/aws/rust-runtime/aws-config/src/ecs.rs @@ -21,8 +21,8 @@ //! URL to load credentials. The URL MUST satisfy one of the following three properties: //! 1. The URL begins with `https` //! 2. The URL refers to an allowed IP address. If a URL contains a domain name instead of an IP address, -//! a DNS lookup will be performed. ALL resolved IP addresses MUST refer to an allowed IP address, or -//! the credentials provider will return `CredentialsError::InvalidConfiguration`. Valid IP addresses are: +//! a DNS lookup will be performed. ALL resolved IP addresses MUST refer to an allowed IP address, or +//! the credentials provider will return `CredentialsError::InvalidConfiguration`. Valid IP addresses are: //! a) Loopback interfaces //! b) The [ECS Task Metadata V2](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-metadata-endpoint-v2.html) //! address ie 169.254.170.2. @@ -416,9 +416,9 @@ impl From for InvalidFullUriError { /// Either: /// 1. The URL is uses `https` /// 2. The URL refers to an allowed IP. If a URL contains a domain name instead of an IP address, -/// a DNS lookup will be performed. ALL resolved IP addresses MUST refer to an allowed IP, or -/// the credentials provider will return `CredentialsError::InvalidConfiguration`. Allowed IPs -/// are the loopback interfaces, and the known ECS/EKS container IPs. +/// a DNS lookup will be performed. ALL resolved IP addresses MUST refer to an allowed IP, or +/// the credentials provider will return `CredentialsError::InvalidConfiguration`. Allowed IPs +/// are the loopback interfaces, and the known ECS/EKS container IPs. async fn validate_full_uri( uri: &str, dns: Option, diff --git a/aws/rust-runtime/aws-config/src/imds/client.rs b/aws/rust-runtime/aws-config/src/imds/client.rs index 7bdc14f2a7..687f506803 100644 --- a/aws/rust-runtime/aws-config/src/imds/client.rs +++ b/aws/rust-runtime/aws-config/src/imds/client.rs @@ -95,7 +95,7 @@ fn user_agent() -> AwsUserAgent { /// ``` /// /// 2. The `AWS_EC2_METADATA_SERVICE_ENDPOINT` environment variable. Note: If this environment variable -/// is set, it MUST contain to a valid URI or client construction will fail. +/// is set, it MUST contain to a valid URI or client construction will fail. /// /// 3. The `ec2_metadata_service_endpoint` field in `~/.aws/config`: /// ```ini @@ -113,10 +113,10 @@ fn user_agent() -> AwsUserAgent { /// ``` /// /// 5. An [endpoint mode](EndpointMode) loaded from the `AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE` environment -/// variable. Valid values: `IPv4`, `IPv6` +/// variable. Valid values: `IPv4`, `IPv6` /// /// 6. An [endpoint mode](EndpointMode) loaded from the `ec2_metadata_service_endpoint_mode` field in -/// `~/.aws/config`: +/// `~/.aws/config`: /// ```ini /// [default] /// # ... other configuration diff --git a/aws/rust-runtime/aws-config/src/profile/credentials.rs b/aws/rust-runtime/aws-config/src/profile/credentials.rs index 3e61d2abca..9f4d352b04 100644 --- a/aws/rust-runtime/aws-config/src/profile/credentials.rs +++ b/aws/rust-runtime/aws-config/src/profile/credentials.rs @@ -18,9 +18,9 @@ //! //! This module contains two sub modules: //! - `repr` which contains an abstract representation of a provider chain and the logic to -//! build it from `~/.aws/credentials` and `~/.aws/config`. +//! build it from `~/.aws/credentials` and `~/.aws/config`. //! - `exec` which contains a chain representation of providers to implement passing bootstrapped credentials -//! through a series of providers. +//! through a series of providers. use crate::profile::cell::ErrorTakingOnceCell; #[allow(deprecated)] diff --git a/aws/rust-runtime/aws-config/src/profile/credentials/repr.rs b/aws/rust-runtime/aws-config/src/profile/credentials/repr.rs index 2d14ab76f6..48baba9a94 100644 --- a/aws/rust-runtime/aws-config/src/profile/credentials/repr.rs +++ b/aws/rust-runtime/aws-config/src/profile/credentials/repr.rs @@ -469,11 +469,16 @@ fn credential_process_from_profile( #[cfg(test)] mod tests { + + #[cfg(feature = "test-util")] + use super::ProfileChain; use crate::profile::credentials::repr::BaseProvider; use crate::sensitive_command::CommandWithSensitiveArgs; use serde::Deserialize; + #[cfg(feature = "test-util")] + use std::collections::HashMap; - #[cfg(feature = "test-utils")] + #[cfg(feature = "test-util")] #[test] fn run_test_cases() -> Result<(), Box> { let test_cases: Vec = serde_json::from_str(&std::fs::read_to_string( @@ -487,14 +492,16 @@ mod tests { Ok(()) } - #[cfg(feature = "test-utils")] + #[cfg(feature = "test-util")] fn check(test_case: TestCase) { - use aws_runtime::profile::profile_set::ProfileSet; - crate::profile::credentials::repr::resolve_chain; - let source = ProfileSet::new( + use super::resolve_chain; + use aws_runtime::env_config::property::Properties; + use aws_runtime::env_config::section::EnvConfigSections; + let source = EnvConfigSections::new( test_case.input.profiles, test_case.input.selected_profile, test_case.input.sso_sessions, + Properties::new(), ); let actual = resolve_chain(&source); let expected = test_case.output; @@ -515,16 +522,16 @@ mod tests { } } - #[cfg(feature = "test-utils")] #[derive(Deserialize)] + #[cfg(feature = "test-util")] struct TestCase { docs: String, input: TestInput, output: TestOutput, } - #[cfg(feature = "test-utils")] #[derive(Deserialize)] + #[cfg(feature = "test-util")] struct TestInput { profiles: HashMap>, selected_profile: String, @@ -532,7 +539,7 @@ mod tests { sso_sessions: HashMap>, } - #[cfg(feature = "test-utils")] + #[cfg(feature = "test-util")] fn to_test_output(profile_chain: ProfileChain<'_>) -> Vec { let mut output = vec![]; match profile_chain.base { diff --git a/aws/rust-runtime/aws-config/src/sso/cache.rs b/aws/rust-runtime/aws-config/src/sso/cache.rs index 2aa34024b4..6143256497 100644 --- a/aws/rust-runtime/aws-config/src/sso/cache.rs +++ b/aws/rust-runtime/aws-config/src/sso/cache.rs @@ -140,7 +140,7 @@ fn cached_token_path(identifier: &str, home: &str) -> PathBuf { let mut out = PathBuf::with_capacity(home.len() + "/.aws/sso/cache".len() + ".json".len() + 40); out.push(home); out.push(".aws/sso/cache"); - out.push(&hex::encode(digest::digest( + out.push(hex::encode(digest::digest( &digest::SHA1_FOR_LEGACY_USE_ONLY, identifier.as_bytes(), ))); diff --git a/aws/rust-runtime/aws-runtime/Cargo.toml b/aws/rust-runtime/aws-runtime/Cargo.toml index b918456022..a9117d34f9 100644 --- a/aws/rust-runtime/aws-runtime/Cargo.toml +++ b/aws/rust-runtime/aws-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-runtime" -version = "1.5.0" +version = "1.5.1" authors = ["AWS Rust SDK Team "] description = "Runtime support code for the AWS SDK. This crate isn't intended to be used directly." edition = "2021" diff --git a/aws/rust-runtime/aws-runtime/src/env_config/parse.rs b/aws/rust-runtime/aws-runtime/src/env_config/parse.rs index 05c68d3ab6..7c292ca63d 100644 --- a/aws/rust-runtime/aws-runtime/src/env_config/parse.rs +++ b/aws/rust-runtime/aws-runtime/src/env_config/parse.rs @@ -61,7 +61,7 @@ impl Error for EnvConfigParseError {} /// /// - Sub-properties looks like regular properties (`k=v`) that are nested within an existing property. /// - Sub-properties must be validated for compatibility with other SDKs, but they are not actually -/// parsed into structured data. +/// parsed into structured data. fn validate_subproperty(value: &str, location: Location) -> Result<(), EnvConfigParseError> { if value.trim_matches(WHITESPACE).is_empty() { Ok(()) diff --git a/aws/rust-runtime/aws-runtime/src/env_config/section.rs b/aws/rust-runtime/aws-runtime/src/env_config/section.rs index 1cac0ffb64..bb8c9015e2 100644 --- a/aws/rust-runtime/aws-runtime/src/env_config/section.rs +++ b/aws/rust-runtime/aws-runtime/src/env_config/section.rs @@ -175,7 +175,7 @@ impl EnvConfigSections { /// Create a new Profile set directly from a HashMap /// /// This method creates a ProfileSet directly from a hashmap with no normalization for test purposes. - #[cfg(test)] + #[cfg(any(test, feature = "test-util"))] pub fn new( profiles: HashMap>, selected_profile: impl Into>, diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ClientEnumGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ClientEnumGenerator.kt index f45c19d74b..f5bbbefb9c 100644 --- a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ClientEnumGenerator.kt +++ b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/ClientEnumGenerator.kt @@ -100,7 +100,7 @@ data class InfallibleEnumType( """ impl ::std::str::FromStr for ${context.enumName} { type Err = ::std::convert::Infallible; - + fn from_str(s: &str) -> #{Result}::Err> { #{Ok}(${context.enumName}::from(s)) } @@ -162,7 +162,12 @@ data class InfallibleEnumType( override fun additionalDocs(context: EnumGeneratorContext): Writable = writable { - renderForwardCompatibilityNote(context.enumName, context.sortedMembers, UNKNOWN_VARIANT, UNKNOWN_VARIANT_VALUE) + renderForwardCompatibilityNote( + context.enumName, + context.sortedMembers, + UNKNOWN_VARIANT, + UNKNOWN_VARIANT_VALUE, + ) } override fun additionalEnumMembers(context: EnumGeneratorContext): Writable = @@ -269,6 +274,7 @@ data class InfallibleEnumType( - It might inadvertently shadow other intended match arms. """.trimIndent(), ) + docs("") } } diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/EnumGenerator.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/EnumGenerator.kt index d1eac1488e..02b0ba14d7 100644 --- a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/EnumGenerator.kt +++ b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/EnumGenerator.kt @@ -156,7 +156,7 @@ private fun RustWriter.docWithNote( doc?.also { docs(escape(it)) } note?.also { // Add a blank line between the docs and the note to visually differentiate - doc?.also { write("///") } + write("///") docs("_Note: ${it}_") } } diff --git a/gradle.properties b/gradle.properties index 38f4db3df4..4cfe1db1f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # # Rust MSRV (entered into the generated README) -rust.msrv=1.78.0 +rust.msrv=1.81.0 # To enable debug, swap out the two lines below. # When changing this value, be sure to run `./gradlew --stop` to kill the Gradle daemon. # org.gradle.jvmargs=-Xmx1024M -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5006 diff --git a/rust-runtime/Cargo.lock b/rust-runtime/Cargo.lock index f612e1db82..6a4c1a8870 100644 --- a/rust-runtime/Cargo.lock +++ b/rust-runtime/Cargo.lock @@ -132,7 +132,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ - "aws-smithy-async 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aws-smithy-async 1.2.1", "aws-smithy-runtime-api 1.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-types 1.2.9", "zeroize", @@ -188,7 +188,7 @@ checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea" dependencies = [ "aws-credential-types", "aws-sigv4", - "aws-smithy-async 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aws-smithy-async 1.2.1", "aws-smithy-eventstream 0.60.5 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-http 0.60.11 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-runtime 1.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -215,7 +215,7 @@ dependencies = [ "aws-credential-types", "aws-runtime", "aws-sigv4", - "aws-smithy-async 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aws-smithy-async 1.2.1", "aws-smithy-checksums 0.60.13 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-eventstream 0.60.5 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-http 0.60.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -272,23 +272,23 @@ dependencies = [ [[package]] name = "aws-smithy-async" version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", - "pin-utils", "tokio", - "tokio-test", ] [[package]] name = "aws-smithy-async" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +version = "1.2.2" dependencies = [ "futures-util", "pin-project-lite", + "pin-utils", "tokio", + "tokio-test", ] [[package]] @@ -396,8 +396,8 @@ dependencies = [ name = "aws-smithy-experimental" version = "0.1.5" dependencies = [ - "aws-smithy-async 1.2.1", - "aws-smithy-runtime 1.7.4", + "aws-smithy-async 1.2.2", + "aws-smithy-runtime 1.7.5", "aws-smithy-runtime-api 1.7.3", "aws-smithy-types 1.2.10", "h2 0.4.7", @@ -818,7 +818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" dependencies = [ "aws-credential-types", - "aws-smithy-async 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aws-smithy-async 1.2.1", "aws-smithy-runtime-api 1.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "aws-smithy-types 1.2.9", "rustc_version", @@ -1989,7 +1989,7 @@ dependencies = [ "aws-smithy-compression", "aws-smithy-http 0.60.11", "aws-smithy-json 0.61.1", - "aws-smithy-runtime 1.7.4", + "aws-smithy-runtime 1.7.5", "aws-smithy-runtime-api 1.7.3", "aws-smithy-types 1.2.10", "aws-smithy-xml 0.60.9", diff --git a/rust-runtime/aws-smithy-async/Cargo.toml b/rust-runtime/aws-smithy-async/Cargo.toml index d992d86ad8..053e8170ea 100644 --- a/rust-runtime/aws-smithy-async/Cargo.toml +++ b/rust-runtime/aws-smithy-async/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-async" -version = "1.2.1" +version = "1.2.2" authors = ["AWS Rust SDK Team ", "John DiSanti "] description = "Async runtime agnostic abstractions for smithy-rs." edition = "2021" diff --git a/rust-runtime/aws-smithy-async/src/test_util/controlled_sleep.rs b/rust-runtime/aws-smithy-async/src/test_util/controlled_sleep.rs index a331fb4650..0ab5369cf2 100644 --- a/rust-runtime/aws-smithy-async/src/test_util/controlled_sleep.rs +++ b/rust-runtime/aws-smithy-async/src/test_util/controlled_sleep.rs @@ -186,7 +186,7 @@ impl AsyncSleep for ControlledSleep { /// Returns a trio of tools to test interactions with time /// /// 1. [`ManualTimeSource`] which starts at a specific time and only advances when `sleep` is called. -/// It MUST be paired with [`ControlledSleep`] in order to function. +/// It MUST be paired with [`ControlledSleep`] in order to function. pub fn controlled_time_and_sleep( start_time: SystemTime, ) -> (ManualTimeSource, ControlledSleep, SleepGate) { diff --git a/rust-runtime/aws-smithy-runtime/Cargo.toml b/rust-runtime/aws-smithy-runtime/Cargo.toml index d25e3c3929..29a6d2fa2c 100644 --- a/rust-runtime/aws-smithy-runtime/Cargo.toml +++ b/rust-runtime/aws-smithy-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-runtime" -version = "1.7.4" +version = "1.7.5" authors = ["AWS Rust SDK Team ", "Zelda Hessler "] description = "The new smithy runtime crate" edition = "2021" diff --git a/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs b/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs index e4ad46494a..37090563e8 100644 --- a/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs +++ b/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs @@ -168,7 +168,7 @@ impl ReplayingClient { .await; body_comparer(expected.body().as_ref(), actual.body().as_ref())?; let actual: HttpRequest = actual.map(SdkBody::from).try_into()?; - aws_smithy_protocol_test::assert_uris_match(&expected.uri().to_string(), actual.uri()); + aws_smithy_protocol_test::assert_uris_match(expected.uri().to_string(), actual.uri()); let expected_headers = expected .headers() .keys() diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 51985806fc..1de01fa45c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.78.0" +channel = "1.81.0" diff --git a/tools/ci-build/Dockerfile b/tools/ci-build/Dockerfile index ff6b1a9585..3d7b834d12 100644 --- a/tools/ci-build/Dockerfile +++ b/tools/ci-build/Dockerfile @@ -6,7 +6,7 @@ # This is the base Docker build image used by CI ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2023 -ARG rust_stable_version=1.78.0 +ARG rust_stable_version=1.81.0 ARG rust_nightly_version=nightly-2024-06-30 FROM ${base_image} AS bare_base_image @@ -132,7 +132,7 @@ ARG rust_nightly_version RUN cargo +${rust_nightly_version} install cargo-component --locked --version ${cargo_component_version} FROM install_rust AS cargo_semver_checks -ARG cargo_semver_checks_version=0.27.0 +ARG cargo_semver_checks_version=0.36.0 RUN cargo install cargo-semver-checks --locked --version ${cargo_semver_checks_version} FROM install_rust AS cargo_mdbook diff --git a/tools/ci-build/sdk-lints/src/changelog.rs b/tools/ci-build/sdk-lints/src/changelog.rs index c7f42d4485..d116172709 100644 --- a/tools/ci-build/sdk-lints/src/changelog.rs +++ b/tools/ci-build/sdk-lints/src/changelog.rs @@ -34,6 +34,7 @@ impl Check for ChangelogNext { } } +#[allow(dead_code)] pub(crate) struct DotChangelog; impl Lint for DotChangelog { @@ -56,6 +57,7 @@ impl Check for DotChangelog { } /// Validate that changelog entries in the `.changelog` directory follows best practices +#[allow(dead_code)] fn check_changelog_next(path: impl AsRef + Debug) -> std::result::Result<(), Vec> { let parsed = ChangelogLoader::default() .load_from_dir(path)