Upgrade MSRV to 1.68.2 (#2745)

jdisanti · Zelda Hessler · 82marbag · web-flow · commit cfff41a8837b · 2023-06-13T15:23:04.000Z
## Motivation and Context
This PR upgrades the MSRV to 1.68.2.

## Checklist
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the
smithy-rs codegen or runtime crates
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the AWS
SDK, generated SDK code, or SDK runtime crates

----

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

---------

Co-authored-by: Zelda Hessler &lt;zhessler@amazon.com&gt;
Co-authored-by: 82marbag &lt;69267416+82marbag@users.noreply.github.com&gt;
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,3 +1,7 @@
 [build]
 # Share one `target` directory at the project root for all Cargo projects and workspaces in smithy-rs
 target-dir = "target"
+
+# TODO(https://github.com/awslabs/smithy-rs/issues/2766): The sparse registry config can be removed when upgrading to Rust 1.70
+[registries.crates-io]
+protocol = "sparse"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ on:
         required: false
 
 env:
-  rust_version: 1.67.1
+  rust_version: 1.68.2
   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
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.67.1
+  rust_version: 1.68.2
 
 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
@@ -8,7 +8,7 @@ on:
 name: Update GitHub Pages
 
 env:
-  rust_version: 1.67.1
+  rust_version: 1.68.2
 
 # Allow only one doc pages build to run at a time for the entire smithy-rs repo
 concurrency:
diff --git a/.github/workflows/pull-request-bot.yml b/.github/workflows/pull-request-bot.yml
@@ -28,7 +28,7 @@ concurrency:
 
 env:
   java_version: 11
-  rust_version: 1.67.1
+  rust_version: 1.68.2
   rust_toolchain_components: clippy,rustfmt
   apt_dependencies: libssl-dev gnuplot jq
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.67.1
+  rust_version: 1.68.2
 
 name: Release smithy-rs
 run-name: ${{ github.workflow }} ${{ inputs.semantic_version }} (${{ inputs.commit_sha }}) - ${{ inputs.dry_run && 'Dry run' || 'Production run' }}
diff --git a/.github/workflows/update-sdk-next.yml b/.github/workflows/update-sdk-next.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Set up Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.67.1
+        toolchain: 1.68.2
     - name: Delete old SDK
       run: |
     - name: Generate a fresh SDK
diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml
@@ -134,6 +134,18 @@ references = ["smithy-rs#2742"]
 meta = { "breaking" = true, "tada" = false, "bug" = false }
 author = "ysaito1001"
 
+[[aws-sdk-rust]]
+message = "Update MSRV to Rust 1.68.2"
+references = ["smithy-rs#2745"]
+meta = { "breaking" = true, "tada" = false, "bug" = false }
+author = "jdisanti"
+
+[[smithy-rs]]
+message = "Update MSRV to Rust 1.68.2"
+references = ["smithy-rs#2745"]
+meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "all"}
+author = "jdisanti"
+
 [[smithy-rs]]
 message = """`ShapeId` is the new structure used to represent a shape, with its absolute name, namespace and name.
 `OperationExtension`'s members are replaced by the `ShapeId` and operations' names are now replced by a `ShapeId`.
diff --git a/aws/rust-runtime/aws-inlineable/src/glacier_checksums.rs b/aws/rust-runtime/aws-inlineable/src/glacier_checksums.rs
@@ -109,7 +109,7 @@ fn compute_hash_tree(mut hashes: Vec<Digest>) -> Digest {
         "even an empty file will produce a digest. this function assumes that hashes is non-empty"
     );
     while hashes.len() > 1 {
-        let next = hashes.chunks(2).into_iter().map(|chunk| match *chunk {
+        let next = hashes.chunks(2).map(|chunk| match *chunk {
             [left, right] => {
                 let mut ctx = Context::new(&SHA256);
                 ctx.update(left.as_ref());
diff --git a/aws/rust-runtime/aws-inlineable/src/glacier_interceptors.rs b/aws/rust-runtime/aws-inlineable/src/glacier_interceptors.rs
@@ -215,7 +215,7 @@ fn compute_hash_tree(mut hashes: Vec<Digest>) -> Digest {
         "even an empty file will produce a digest. this function assumes that hashes is non-empty"
     );
     while hashes.len() > 1 {
-        let next = hashes.chunks(2).into_iter().map(|chunk| match *chunk {
+        let next = hashes.chunks(2).map(|chunk| match *chunk {
             [left, right] => {
                 let mut ctx = Context::new(&SHA256);
                 ctx.update(left.as_ref());
diff --git a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsPresigningDecorator.kt b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsPresigningDecorator.kt
@@ -229,7 +229,7 @@ class AwsInputPresignedMethod(
                 }
                 rustTemplate(
                     """
-                    let mut config = props.get_mut::<#{sig_auth}::signer::OperationSigningConfig>()
+                    let config = props.get_mut::<#{sig_auth}::signer::OperationSigningConfig>()
                         .expect("signing config added by make_operation()");
                     config.signature_type = #{sig_auth}::signer::HttpSignatureType::HttpRequestQueryParams;
                     config.expires_in = Some(presigning_config.expires());
diff --git a/aws/sdk/integration-tests/webassembly/.cargo/config.toml b/aws/sdk/integration-tests/webassembly/.cargo/config.toml
@@ -3,3 +3,7 @@ target = "wasm32-wasi"
 
 [target.wasm32-wasi]
 rustflags = ["-C", "opt-level=1"]
+
+# TODO(Rust 1.70): The sparse registry config can be removed when upgrading to Rust 1.70
+[registries.crates-io]
+protocol = "sparse"
diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/Rust.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/Rust.kt
@@ -109,7 +109,7 @@ object TestWorkspace {
                 // help rust select the right version when we run cargo test
                 // TODO(https://github.com/awslabs/smithy-rs/issues/2048): load this from the msrv property using a
                 //  method as we do for runtime crate versions
-                "[toolchain]\nchannel = \"1.67.1\"\n",
+                "[toolchain]\nchannel = \"1.68.2\"\n",
             )
             // ensure there at least an empty lib.rs file to avoid broken crates
             newProject.resolve("src").mkdirs()
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 #
 
 # Rust MSRV (entered into the generated README)
-rust.msrv=1.67.1
+rust.msrv=1.68.2
 
 # To enable debug, swap out the two lines below.
 # When changing this value, be sure to run `./gradlew --stop` to kill the Gradle daemon.
diff --git a/rust-runtime/aws-smithy-http-server/src/proto/aws_json_10/router.rs b/rust-runtime/aws-smithy-http-server/src/proto/aws_json_10/router.rs
@@ -5,7 +5,6 @@
 
 use crate::body::{empty, BoxBody};
 use crate::extension::RuntimeErrorExtension;
-use crate::proto::aws_json::router::Error;
 use crate::response::IntoResponse;
 use crate::routing::{method_disallowed, UNKNOWN_OPERATION_EXCEPTION};
 
diff --git a/rust-runtime/aws-smithy-http-server/src/proto/aws_json_11/router.rs b/rust-runtime/aws-smithy-http-server/src/proto/aws_json_11/router.rs
@@ -5,7 +5,6 @@
 
 use crate::body::{empty, BoxBody};
 use crate::extension::RuntimeErrorExtension;
-use crate::proto::aws_json::router::Error;
 use crate::response::IntoResponse;
 use crate::routing::{method_disallowed, UNKNOWN_OPERATION_EXCEPTION};
 
diff --git a/rust-runtime/aws-smithy-http-server/src/proto/rest_json_1/router.rs b/rust-runtime/aws-smithy-http-server/src/proto/rest_json_1/router.rs
@@ -5,7 +5,6 @@
 
 use crate::body::BoxBody;
 use crate::extension::RuntimeErrorExtension;
-use crate::proto::rest::router::Error;
 use crate::response::IntoResponse;
 use crate::routing::{method_disallowed, UNKNOWN_OPERATION_EXCEPTION};
 
diff --git a/rust-runtime/aws-smithy-http-server/src/proto/rest_xml/router.rs b/rust-runtime/aws-smithy-http-server/src/proto/rest_xml/router.rs
@@ -6,7 +6,6 @@
 use crate::body::empty;
 use crate::body::BoxBody;
 use crate::extension::RuntimeErrorExtension;
-use crate::proto::rest::router::Error;
 use crate::response::IntoResponse;
 use crate::routing::{method_disallowed, UNKNOWN_OPERATION_EXCEPTION};
 
diff --git a/rust-runtime/aws-smithy-runtime/src/client/test_util/serializer.rs b/rust-runtime/aws-smithy-runtime/src/client/test_util/serializer.rs
@@ -44,10 +44,8 @@ impl RequestSerializer for CannedRequestSerializer {
         _input: Input,
         _cfg: &mut ConfigBag,
     ) -> Result<HttpRequest, BoxError> {
-        let req = self
-            .take()
-            .ok_or("CannedRequestSerializer's inner value has already been taken.")?;
-        req
+        self.take()
+            .ok_or("CannedRequestSerializer's inner value has already been taken.")?
     }
 }
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.67.1"
+channel = "1.68.2"
diff --git a/tools/.cargo/config.toml b/tools/.cargo/config.toml
@@ -2,3 +2,7 @@
 # Tools shouldn't share `target` with the rest of the project to
 # avoid thrash from differing compiler flags
 target-dir = "target"
+
+# TODO(Rust 1.70): The sparse registry config can be removed when upgrading to Rust 1.70
+[registries.crates-io]
+protocol = "sparse"
diff --git a/tools/ci-build/Dockerfile b/tools/ci-build/Dockerfile
@@ -6,8 +6,8 @@
 # This is the base Docker build image used by CI
 
 ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2
-ARG rust_stable_version=1.67.1
-ARG rust_nightly_version=nightly-2022-11-16
+ARG rust_stable_version=1.68.2
+ARG rust_nightly_version=nightly-2023-05-31
 
 FROM ${base_image} AS bare_base_image
 RUN yum -y updateinfo
@@ -80,53 +80,46 @@ RUN set -eux; \
         cd smithy-rs; \
         git checkout ${smithy_rs_commit_hash}; \
     fi; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/publisher; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/changelogger; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/crate-hasher; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/difftags; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/sdk-lints; \
-    cargo +${rust_nightly_version} -Z sparse-registry install --locked --path tools/ci-build/sdk-versioner; \
+    cargo install --locked --path tools/ci-build/publisher; \
+    cargo install --locked --path tools/ci-build/changelogger; \
+    cargo install --locked --path tools/ci-build/crate-hasher; \
+    cargo install --locked --path tools/ci-build/difftags; \
+    cargo install --locked --path tools/ci-build/sdk-lints; \
+    cargo install --locked --path tools/ci-build/sdk-versioner; \
     chmod g+rw -R /opt/cargo/registry
 
 FROM install_rust AS cargo_deny
 ARG cargo_deny_version=0.13.5
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-deny --locked --version ${cargo_deny_version}
+RUN cargo install cargo-deny --locked --version ${cargo_deny_version}
 
 FROM install_rust AS cargo_udeps
 ARG cargo_udeps_version=0.1.35
 ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-udeps --locked --version ${cargo_udeps_version}
+RUN cargo +${rust_nightly_version} install cargo-udeps --locked --version ${cargo_udeps_version}
 
 FROM install_rust AS cargo_hack
 ARG cargo_hack_version=0.5.23
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-hack --locked --version ${cargo_hack_version}
+RUN cargo install cargo-hack --locked --version ${cargo_hack_version}
 
 FROM install_rust AS cargo_minimal_versions
 ARG cargo_minimal_versions_version=0.1.8
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-minimal-versions --locked --version ${cargo_minimal_versions_version}
+RUN cargo install cargo-minimal-versions --locked --version ${cargo_minimal_versions_version}
 
 FROM install_rust AS cargo_check_external_types
-ARG cargo_check_external_types_version=0.1.6
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-check-external-types --locked --version ${cargo_check_external_types_version}
+ARG cargo_check_external_types_version=0.1.7
+RUN cargo install cargo-check-external-types --locked --version ${cargo_check_external_types_version}
 
 FROM install_rust AS maturin
 ARG maturin_version=0.14.1
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install maturin --locked --version ${maturin_version}
+RUN cargo install maturin --locked --version ${maturin_version}
 
 FROM install_rust AS wasm_pack
 ARG wasm_pack_version=0.11.0
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install wasm-pack --locked --version ${wasm_pack_version}
+RUN cargo install wasm-pack --locked --version ${wasm_pack_version}
 
 FROM install_rust AS wasmtime
 ARG wasmtime_precompiled_url=https://github.com/bytecodealliance/wasmtime/releases/download/v7.0.0/wasmtime-v7.0.0-x86_64-linux.tar.xz
 ARG wasmtime_precompiled_sha256=b8a1c97f9107c885ea73a5c38677d0d340a7c26879d366e8a5f3dce84cffec99
-ARG rust_nightly_version
 RUN set -eux; \
     curl "${wasmtime_precompiled_url}" -L -o wasmtime.xz; \
     echo "${wasmtime_precompiled_sha256} wasmtime.xz" | sha256sum --check; \
@@ -135,8 +128,7 @@ RUN set -eux; \
 
 FROM install_rust AS cargo_wasi
 ARG cargo_wasi_version=0.1.27
-ARG rust_nightly_version
-RUN cargo +${rust_nightly_version} -Z sparse-registry install cargo-wasi --locked --version ${cargo_wasi_version}
+RUN cargo install cargo-wasi --locked --version ${cargo_wasi_version}
 
 FROM install_rust AS cargo_semver_checks
 ARG cargo_semver_checks_version=0.20.0
@@ -194,13 +186,15 @@ COPY --chown=build:build --from=cargo_mdbook /opt/cargo/bin/mdbook /opt/cargo/bi
 COPY --chown=build:build --from=cargo_mdbook_mermaid /opt/cargo/bin/mdbook-mermaid /opt/cargo/bin/mdbook-mermaid
 COPY --chown=build:build --from=musl_toolchain /usr/local/musl/ /usr/local/musl/
 ENV PATH=$PATH:/usr/local/musl/bin/
+# TODO(Rust 1.70): The sparse registry config (`CARGO_REGISTRIES_CRATES_IO_PROTOCOL`) can be removed when upgrading to Rust 1.70
 ENV PATH=/opt/cargo/bin:$PATH \
     CARGO_HOME=/opt/cargo \
     RUSTUP_HOME=/opt/rustup \
     JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto.x86_64 \
     GRADLE_USER_HOME=/home/build/.gradle \
     RUST_STABLE_VERSION=${rust_stable_version} \
     RUST_NIGHTLY_VERSION=${rust_nightly_version} \
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \
     CARGO_INCREMENTAL=0 \
     RUSTDOCFLAGS="-D warnings" \
     RUSTFLAGS="-D warnings" \
diff --git a/tools/ci-build/smithy-rs-tool-common/src/changelog.rs b/tools/ci-build/smithy-rs-tool-common/src/changelog.rs
@@ -11,22 +11,17 @@ use std::fmt::{self, Display};
 use std::path::Path;
 use std::str::FromStr;
 
-#[derive(Copy, Clone, Debug, Serialize, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Default, Serialize, PartialEq, Eq)]
 pub enum SdkAffected {
     #[serde(rename = "client")]
     Client,
     #[serde(rename = "server")]
     Server,
     #[serde(rename = "all")]
+    #[default]
     All,
 }
 
-impl Default for SdkAffected {
-    fn default() -> Self {
-        SdkAffected::All
-    }
-}
-
 impl Display for SdkAffected {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -209,7 +204,6 @@ impl Changelog {
                     // Remove comments from the top
                     let value = value
                         .split('\n')
-                        .into_iter()
                         .filter(|line| !line.trim().starts_with('#'))
                         .collect::<Vec<_>>()
                         .join("\n");
diff --git a/tools/ci-build/smithy-rs-tool-common/src/git.rs b/tools/ci-build/smithy-rs-tool-common/src/git.rs
@@ -295,7 +295,6 @@ impl Git for GitCLI {
         let (stdout, _) = output_text(&output);
         Ok(stdout
             .split_ascii_whitespace()
-            .into_iter()
             .map(CommitHash::from)
             .collect())
     }
