Unverified Commit 10e88416 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Fix clap MSRV issue (#3399) 

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

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

+6 −1
Original line number Diff line number Diff line
@@ -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.x 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"

criterion = "0.5"



[target.'cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))'.dev-dependencies]

ring = "0.17.5"

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt

+6 −0
Original line number Diff line number Diff line
@@ -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.x 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"), DependencyScope.Dev))

                        addDependency(Criterion)

                    }

                    for (serviceSpecific in serviceSpecificCustomizations()) {

aws/sdk/integration-tests/dynamodb/Cargo.toml

+6 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ aws-smithy-runtime-api = { path = "../../build/aws-sdk/sdk/aws-smithy-runtime-ap 
aws-smithy-types = { path = "../../build/aws-sdk/sdk/aws-smithy-types", features = ["test-util"]}

aws-types = { path = "../../build/aws-sdk/sdk/aws-types" }

bytes = "1.0.0"

criterion = { version = "0.5.0" }

futures-util = { version = "0.3.29", default-features = false }

http = "0.2.0"

serde_json = "1.0.0"
@@ -31,6 +30,12 @@ tokio = { version = "1.23.1", features = ["full", "test-util"] } 
tokio-stream = "0.1.5"

tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }



# 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.x 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"

criterion = "0.5"



[[bench]]

name = "deserialization_bench"

harness = false

examples/pokemon-service/Cargo.toml

+4 −1
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ authors = ["Smithy-rs Server Team <smithy-rs-server@amazon.com>"] 
description = "A smithy Rust service to retrieve information about Pokémon."



[dependencies]

clap = { version = "4.1.11", features = ["derive"] }

# TODO(https://github.com/smithy-lang/smithy-rs/issues/3398): Unpin the clap dependency once the SDK MSRV is Rust 1.74.

# Clap was added and pinned to 4.4.x because 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 = { version = "~4.4", features = ["derive"] }

http = "0.2"

hyper = { version = "0.14.26", features = ["server"] }

tokio = "1.26.0"

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

+6 −1
Original line number Diff line number Diff line
@@ -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.x 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"

criterion = "0.5"



[package.metadata.docs.rs]

all-features = true

targets = ["x86_64-unknown-linux-gnu"]