Fix clap MSRV issue

smithy-lang · Feb 8, 2024 · 3d5ee05 · 3d5ee05
1 parent ae52b69
commit 3d5ee05
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/aws/rust-runtime/aws-sigv4/Cargo.toml b/aws/rust-runtime/aws-sigv4/Cargo.toml
@@ -44,7 +44,6 @@ zeroize = { version = "^1", optional = true }
 aws-credential-types = { path = "../aws-credential-types", features = ["test-util", "hardcoded-credentials"] }
 aws-smithy-runtime-api = { path = "../../../rust-runtime/aws-smithy-runtime-api", features = ["client", "test-util"] }
 bytes = "1"
-criterion = "0.5"
 hex-literal = "0.4.1"
 httparse = "1.8"
 libfuzzer-sys = "0.4.6"
@@ -55,6 +54,12 @@ serde_derive = "1.0.180"
 serde_json = "1.0.104"
 time = { version = "0.3.5", features = ["parsing"] }
 
+# TODO(https://github.com/smithy-lang/smithy-rs/issues/3398): Remove clap dependency once the SDK MSRV is 1.74.
+# Clap was added and pinned to 4.4.18 because it is pulled in by criterion, and 4.5.x requires an MSRV of Rust 1.74.
+# Since the SDK MSRV is 1.72, this causes it to fail to compile.
+clap = "~4.4.18"
+criterion = "0.5"
+
 [target.'cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))'.dev-dependencies]
 ring = "0.17.5"
 

diff --git a/...sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt b/...sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt
@@ -30,6 +30,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency.Compani
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency.Companion.smithyProtocolTestHelpers
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency.Companion.smithyRuntime
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency.Companion.smithyRuntimeApiTestUtil
+import software.amazon.smithy.rust.codegen.core.rustlang.CratesIo
 import software.amazon.smithy.rust.codegen.core.rustlang.DependencyScope
 import software.amazon.smithy.rust.codegen.core.rustlang.Writable
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
@@ -106,6 +107,11 @@ class IntegrationTestDependencies(
                         addDependency(TracingSubscriber)
                     }
                     if (hasBenches) {
+                        // TODO(https://github.com/smithy-lang/smithy-rs/issues/3398): Remove clap dependency once the
+                        // SDK MSRV is 1.74. Clap was added and pinned to 4.4.18 because it is pulled in by criterion,
+                        // and 4.5.x requires an MSRV of Rust 1.74. Since the SDK MSRV is 1.72, this causes it to fail
+                        // to compile.
+                        addDependency(CargoDependency("clap", CratesIo("~4.4.18"), DependencyScope.Dev))
                         addDependency(Criterion)
                     }
                     for (serviceSpecific in serviceSpecificCustomizations()) {

diff --git a/rust-runtime/aws-smithy-types/Cargo.toml b/rust-runtime/aws-smithy-types/Cargo.toml
@@ -53,7 +53,6 @@ tokio-util = { version = "0.7", optional = true }
 [dev-dependencies]
 base64 = "0.13.0"
 ciborium = { version = "0.2.1" }
-criterion = "0.5"
 lazy_static = "1.4"
 proptest = "1"
 rand = "0.8.4"
@@ -69,6 +68,12 @@ tokio = { version = "1.23.1", features = [
 tokio-stream = "0.1.5"
 tempfile = "3.2.0"
 
+# TODO(https://github.com/smithy-lang/smithy-rs/issues/3398): Remove clap dependency once the SDK MSRV is 1.74.
+# Clap was added and pinned to 4.4.18 because it is pulled in by criterion, and 4.5.x requires an MSRV of Rust 1.74.
+# Since the SDK MSRV is 1.72, this causes it to fail to compile.
+clap = "~4.4.18"
+criterion = "0.5"
+
 [package.metadata.docs.rs]
 all-features = true
 targets = ["x86_64-unknown-linux-gnu"]