Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust msrv 1.74 #3410

Merged
merged 8 commits into from
Feb 16, 2024
Merged

Rust msrv 1.74 #3410

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f330073
Upgrade MSRV to 1.74
rcoh Feb 13, 2024
157bc61
Upgrade MSRV to 1.74
rcoh Feb 13, 2024
a8818da
Misc clippy fixes
rcoh Feb 15, 2024
7116938
More clippy fixes
rcoh Feb 15, 2024
8f52b99
Fix poorly cleaned up clap dependency
rcoh Feb 15, 2024
40859a6
allow more lints
rcoh Feb 15, 2024
6ef82a7
Update Changelog
rcoh Feb 15, 2024
a34dd10
Apply suggestions from code review
jdisanti Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Upgrade MSRV to 1.74
  • Loading branch information
@rcoh
rcoh committed Feb 15, 2024
commit 157bc6137437a6626259e6ca9831b55cf7c4f2a0
4 changes: 0 additions & 4 deletions aws/rust-runtime/aws-sigv4/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ 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]
Expand Down
6 changes: 0 additions & 6 deletions ...sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ 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
Expand Down Expand Up @@ -107,11 +106,6 @@ 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()) {
Expand Down
4 changes: 0 additions & 4 deletions aws/sdk/integration-tests/dynamodb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ 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]]
Expand Down
4 changes: 0 additions & 4 deletions examples/pokemon-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ authors = ["Smithy-rs Server Team <[email protected]>"]
description = "A smithy Rust service to retrieve information about Pokémon."

[dependencies]
# 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"
Expand Down
4 changes: 0 additions & 4 deletions rust-runtime/aws-smithy-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ 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]
Expand Down