From b382ebc06374791782d21b1d3c9176b3f82de56a Mon Sep 17 00:00:00 2001 From: John DiSanti Date: Wed, 21 Feb 2024 06:28:25 -0800 Subject: [PATCH] Upgrade cargo-check-external-types to 0.1.11 (#3413) _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._ --- .github/workflows/pull-request-bot.yml | 2 +- rust-runtime/aws-smithy-async/src/test_util.rs | 1 + rust-runtime/aws-smithy-checksums/Cargo.toml | 2 +- rust-runtime/aws-smithy-http-server/src/macros.rs | 2 -- rust-runtime/aws-smithy-runtime-api/src/shared.rs | 2 +- .../aws-smithy-runtime/src/test_util/capture_test_logs.rs | 2 +- rust-runtime/aws-smithy-types/src/type_erasure.rs | 4 ++-- tools/ci-build/Dockerfile | 6 +++--- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pull-request-bot.yml b/.github/workflows/pull-request-bot.yml index fc5d0110c5..313e8e8ee5 100644 --- a/.github/workflows/pull-request-bot.yml +++ b/.github/workflows/pull-request-bot.yml @@ -30,7 +30,7 @@ env: apt_dependencies: libssl-dev gnuplot jq java_version: 11 rust_toolchain_components: clippy,rustfmt - rust_nightly_version: nightly-2023-10-10 + rust_nightly_version: nightly-2024-02-07 jobs: generate-diff: diff --git a/rust-runtime/aws-smithy-async/src/test_util.rs b/rust-runtime/aws-smithy-async/src/test_util.rs index dd7eacfd89..78b69d969f 100644 --- a/rust-runtime/aws-smithy-async/src/test_util.rs +++ b/rust-runtime/aws-smithy-async/src/test_util.rs @@ -189,6 +189,7 @@ impl InstantSleep { /// task.await.expect("successful completion"); /// # }; /// ``` +#[allow(dead_code)] // unused fields retained for their `Drop` impls pub struct CapturedSleep<'a>(oneshot::Sender<()>, &'a SleepGate, Duration); impl CapturedSleep<'_> { /// Allow the calling code to advance past the call to [`AsyncSleep::sleep`] diff --git a/rust-runtime/aws-smithy-checksums/Cargo.toml b/rust-runtime/aws-smithy-checksums/Cargo.toml index 46c912efd4..985877fdf2 100644 --- a/rust-runtime/aws-smithy-checksums/Cargo.toml +++ b/rust-runtime/aws-smithy-checksums/Cargo.toml @@ -16,7 +16,7 @@ repository = "https://github.com/smithy-lang/smithy-rs" aws-smithy-http = { path = "../aws-smithy-http" } aws-smithy-types = { path = "../aws-smithy-types" } bytes = "1" -crc32c = "0.6.2" +crc32c = "0.6.5" crc32fast = "1.3" hex = "0.4.3" http = "0.2.8" diff --git a/rust-runtime/aws-smithy-http-server/src/macros.rs b/rust-runtime/aws-smithy-http-server/src/macros.rs index 7f70ba5562..0bb2f4e352 100644 --- a/rust-runtime/aws-smithy-http-server/src/macros.rs +++ b/rust-runtime/aws-smithy-http-server/src/macros.rs @@ -83,8 +83,6 @@ macro_rules! opaque_future { }; } -pub use opaque_future; - macro_rules! convert_to_request_rejection { ($from:ty, $to:ident) => { impl From<$from> for RequestRejection { diff --git a/rust-runtime/aws-smithy-runtime-api/src/shared.rs b/rust-runtime/aws-smithy-runtime-api/src/shared.rs index cd15a13506..19405451ce 100644 --- a/rust-runtime/aws-smithy-runtime-api/src/shared.rs +++ b/rust-runtime/aws-smithy-runtime-api/src/shared.rs @@ -202,7 +202,7 @@ mod tests { impl Thing for Thingamajig {} #[derive(Debug)] - struct SharedThing(Arc); + struct SharedThing(#[allow(dead_code)] Arc); impl Thing for SharedThing {} impl SharedThing { fn new(thing: impl Thing + 'static) -> Self { diff --git a/rust-runtime/aws-smithy-runtime/src/test_util/capture_test_logs.rs b/rust-runtime/aws-smithy-runtime/src/test_util/capture_test_logs.rs index 86d31d43bb..92b450c115 100644 --- a/rust-runtime/aws-smithy-runtime/src/test_util/capture_test_logs.rs +++ b/rust-runtime/aws-smithy-runtime/src/test_util/capture_test_logs.rs @@ -12,7 +12,7 @@ use tracing_subscriber::fmt::TestWriter; /// A guard that resets log capturing upon being dropped. #[derive(Debug)] -pub struct LogCaptureGuard(DefaultGuard); +pub struct LogCaptureGuard(#[allow(dead_code)] DefaultGuard); /// Capture logs from this test. /// diff --git a/rust-runtime/aws-smithy-types/src/type_erasure.rs b/rust-runtime/aws-smithy-types/src/type_erasure.rs index 86533cb9f3..f209008a5c 100644 --- a/rust-runtime/aws-smithy-types/src/type_erasure.rs +++ b/rust-runtime/aws-smithy-types/src/type_erasure.rs @@ -233,9 +233,9 @@ mod tests { use std::fmt; #[derive(Debug)] - struct Foo(&'static str); + struct Foo(#[allow(dead_code)] &'static str); #[derive(Debug)] - struct Bar(isize); + struct Bar(#[allow(dead_code)] isize); #[derive(Debug, Clone, PartialEq, Eq)] struct TestErr { diff --git a/tools/ci-build/Dockerfile b/tools/ci-build/Dockerfile index 0fe17e5c76..d6262863c7 100644 --- a/tools/ci-build/Dockerfile +++ b/tools/ci-build/Dockerfile @@ -7,7 +7,7 @@ ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2023 ARG rust_stable_version=1.74.1 -ARG rust_nightly_version=nightly-2023-10-10 +ARG rust_nightly_version=nightly-2024-02-07 FROM ${base_image} AS bare_base_image RUN yum -y updateinfo @@ -96,7 +96,7 @@ ARG cargo_deny_version=0.13.5 RUN cargo install cargo-deny --locked --version ${cargo_deny_version} FROM install_rust AS cargo_udeps -ARG cargo_udeps_version=0.1.42 +ARG cargo_udeps_version=0.1.46 ARG rust_nightly_version RUN cargo +${rust_nightly_version} install cargo-udeps --locked --version ${cargo_udeps_version} @@ -109,7 +109,7 @@ ARG cargo_minimal_versions_version=0.1.19 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.8 +ARG cargo_check_external_types_version=0.1.11 RUN cargo install cargo-check-external-types --locked --version ${cargo_check_external_types_version} FROM install_rust AS maturin