smithy-lang · Velfi · Aug 1, 2023 · Aug 1, 2023 · Aug 1, 2023 · Aug 1, 2023
@@ -29,7 +29,7 @@ on:
         required: false
 
 env:
-  rust_version: 1.68.2
+  rust_version: 1.69.0
   rust_toolchain_components: clippy,rustfmt
   ENCRYPTED_DOCKER_PASSWORD: ${{ secrets.ENCRYPTED_DOCKER_PASSWORD }}
   DOCKER_LOGIN_TOKEN_PASSPHRASE: ${{ secrets.DOCKER_LOGIN_TOKEN_PASSPHRASE }}

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.68.2
+  rust_version: 1.69.0
 
 name: Claim unpublished crate names on crates.io
 run-name: ${{ github.workflow }}

@@ -8,7 +8,7 @@ on:
 name: Update GitHub Pages
 
 env:
-  rust_version: 1.68.2
+  rust_version: 1.69.0
 
 # Allow only one doc pages build to run at a time for the entire smithy-rs repo
 concurrency:

@@ -28,7 +28,7 @@ concurrency:
 
 env:
   java_version: 11
-  rust_version: 1.68.2
+  rust_version: 1.69.0
   rust_toolchain_components: clippy,rustfmt
   apt_dependencies: libssl-dev gnuplot jq
 

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.68.2
+  rust_version: 1.69.0
 
 name: Release smithy-rs
 run-name: ${{ github.workflow }} ${{ inputs.semantic_version }} (${{ inputs.commit_sha }}) - ${{ inputs.dry_run && 'Dry run' || 'Production run' }}

@@ -32,7 +32,7 @@ jobs:
     - name: Set up Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.68.2
+        toolchain: 1.69.0
     - name: Delete old SDK
       run: |
     - name: Generate a fresh SDK

@@ -159,16 +159,16 @@ meta = { "breaking" = true, "tada" = false, "bug" = false }
 author = "ysaito1001"
 
 [[aws-sdk-rust]]
-message = "Update MSRV to Rust 1.68.2"
-references = ["smithy-rs#2745"]
+message = "Update MSRV to Rust 1.69.0"
+references = ["smithy-rs#2893"]
 meta = { "breaking" = true, "tada" = false, "bug" = false }
-author = "jdisanti"
+author = "Velfi"
 
 [[smithy-rs]]
-message = "Update MSRV to Rust 1.68.2"
-references = ["smithy-rs#2745"]
+message = "Update MSRV to Rust 1.69.0"
+references = ["smithy-rs#2893"]
 meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "all" }
-author = "jdisanti"
+author = "Velfi"
 
 [[smithy-rs]]
 message = """`ShapeId` is the new structure used to represent a shape, with its absolute name, namespace and name.

@@ -160,11 +160,11 @@ mod test {
     use crate::endpoint_discovery::create_cache;
     use aws_smithy_async::rt::sleep::{SharedAsyncSleep, TokioSleep};
     use aws_smithy_async::test_util::controlled_time_and_sleep;
-    use aws_smithy_async::time::{SharedTimeSource, SystemTimeSource};
+    use aws_smithy_async::time::{SharedTimeSource, SystemTimeSource, TimeSource};
     use aws_smithy_types::endpoint::Endpoint;
     use std::sync::atomic::{AtomicUsize, Ordering};
     use std::sync::Arc;
-    use std::time::{Duration, SystemTime, UNIX_EPOCH};
+    use std::time::{Duration, UNIX_EPOCH};
     use tokio::time::timeout;
 
     fn check_send_v<T: Send>(t: T) -> T {
@@ -178,7 +178,7 @@ mod test {
             || async {
                 Ok((
                     Endpoint::builder().url("http://foo.com").build(),
-                    SystemTime::now(),
+                    SystemTimeSource::new().now(),
                 ))
             },
             SharedAsyncSleep::new(TokioSleep::new()),

@@ -239,11 +239,8 @@ mod tests {
         let mut body = request.body().try_clone().expect("body is retryable");
 
         let mut body_data = BytesMut::new();
-        loop {
-            match body.data().await {
-                Some(data) => body_data.extend_from_slice(&data.unwrap()),
-                None => break,
-            }
+        while let Some(data) = body.data().await {
+            body_data.extend_from_slice(&data.unwrap())
         }
         let body = std::str::from_utf8(&body_data).unwrap();
         assert_eq!(
@@ -290,11 +287,8 @@ mod tests {
         let mut body = request.body().try_clone().expect("body is retryable");
 
         let mut body_data = BytesMut::new();
-        loop {
-            match body.data().await {
-                Some(data) => body_data.extend_from_slice(&data.unwrap()),
-                None => break,
-            }
+        while let Some(data) = body.data().await {
+            body_data.extend_from_slice(&data.unwrap())
         }
         let body = std::str::from_utf8(&body_data).unwrap();
         let expected_checksum = base64::encode(&crc32c_checksum);

@@ -611,7 +611,7 @@ mod tests {
             security_token: None,
             region: "us-east-1",
             service_name: "foo",
-            time: std::time::SystemTime::now(),
+            time: std::time::SystemTime::UNIX_EPOCH,
             settings,
         };
 
@@ -640,7 +640,7 @@ mod tests {
                 security_token: None,
                 region: "us-east-1",
                 service_name: "foo",
-                time: std::time::SystemTime::now(),
+                time: std::time::SystemTime::UNIX_EPOCH,
                 settings,
             };
 

@@ -111,7 +111,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.68.2\"\n",
+                "[toolchain]\nchannel = \"1.69.0\"\n",
             )
             // ensure there at least an empty lib.rs file to avoid broken crates
             newProject.resolve("src").mkdirs()

@@ -4,7 +4,7 @@
 #
 
 # Rust MSRV (entered into the generated README)
-rust.msrv=1.68.2
+rust.msrv=1.69.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.

@@ -112,7 +112,7 @@ where
     O: ParseHttpResponse<Output = Result<T, E>>,
 {
     if let Some(parsed_response) =
-        debug_span!("parse_unloaded").in_scope(&mut || handler.parse_unloaded(&mut response))
+        debug_span!("parse_unloaded").in_scope(|| handler.parse_unloaded(&mut response))
     {
         trace!(response = ?response, "read HTTP headers for streaming response");
         return sdk_result(parsed_response, response);

@@ -121,7 +121,7 @@ impl Identity {
     }
 }
 
-impl fmt::Debug for Identity {
+impl Debug for Identity {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Identity")
             .field("data", (self.data_debug)(&self.data))
@@ -133,6 +133,7 @@ impl fmt::Debug for Identity {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use aws_smithy_async::time::{SystemTimeSource, TimeSource};
 
     #[test]
     fn check_send_sync() {
@@ -148,7 +149,8 @@ mod tests {
             last: String,
         }
 
-        let expiration = SystemTime::now();
+        let ts = SystemTimeSource::new();
+        let expiration = ts.now();
         let identity = Identity::new(
             MyIdentityData {
                 first: "foo".into(),

@@ -478,7 +478,7 @@ mod tests {
                 .status(StatusCode::OK)
                 .body(SdkBody::empty())
                 .map_err(|err| OrchestratorError::other(Box::new(err)))
-                .map(|res| Output::erase(res)),
+                .map(Output::erase),
         )
     }
 

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.68.2"
+channel = "1.69.0"
@@ -6,7 +6,7 @@
 # This is the base Docker build image used by CI
 
 ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2
-ARG rust_stable_version=1.68.2
+ARG rust_stable_version=1.69.0
 ARG rust_nightly_version=nightly-2023-05-31
 
 FROM ${base_image} AS bare_base_image