From cf4bdeaf0186397a968110c1aad4148d23c29875 Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 31 Mar 2026 19:27:03 -0700 Subject: [PATCH 1/3] try again Created using spr 1.3.6-beta.1 --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index efa3aedcf..b581095aa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -119,7 +119,7 @@ //! No-std users must turn off default features while importing this crate. #![warn(missing_docs)] -#![cfg_attr(doc_cfg, feature(doc_cfg, doc_auto_cfg))] +#![cfg_attr(doc_cfg, feature(doc_cfg))] #[cfg(feature = "alloc")] extern crate alloc; From 329fcaf6000ed38b79814ca144596209aba0b441 Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 31 Mar 2026 21:27:44 -0700 Subject: [PATCH 2/3] nextest no tests, update MSRV Created using spr 1.3.6-beta.1 --- .github/workflows/ci.yml | 2 +- Cargo.toml | 2 +- scripts/commands.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc130e4bd..7c5390746 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust-version: ["1.64", stable] + rust-version: ["1.71", stable] fail-fast: false env: RUSTFLAGS: -D warnings diff --git a/Cargo.toml b/Cargo.toml index 044e8a65d..42c6cdd8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Alternative futures adapters that are more cancellation-aware" readme = "README.md" -rust-version = "1.64.0" +rust-version = "1.71.0" keywords = ["futures", "async-cancellation"] categories = ["asynchronous", "no-std::no-alloc"] repository = "https://github.com/oxidecomputer/cancel-safe-futures" diff --git a/scripts/commands.sh b/scripts/commands.sh index 25fb4b198..d66dcfbde 100755 --- a/scripts/commands.sh +++ b/scripts/commands.sh @@ -32,7 +32,7 @@ run_nextest() { check_cargo_hack echo_err "Running non-doc tests" - run_cargo_hack nextest run --all-targets + NEXTEST_NO_TESTS=pass run_cargo_hack nextest run --all-targets } run_miri() { From 31062b70a759bad32be7b3f2d7d91f0ca3fe43af Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 31 Mar 2026 21:33:43 -0700 Subject: [PATCH 3/3] MSRV 1.85, Rust 2024 Created using spr 1.3.6-beta.1 --- .github/workflows/ci.yml | 2 +- Cargo.toml | 2 +- src/support.rs | 2 +- tests/integration_tests/join_all_then_try.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c5390746..7504e93fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust-version: ["1.71", stable] + rust-version: ["1.85", stable] fail-fast: false env: RUSTFLAGS: -D warnings diff --git a/Cargo.toml b/Cargo.toml index 42c6cdd8a..17ce891f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Alternative futures adapters that are more cancellation-aware" readme = "README.md" -rust-version = "1.71.0" +rust-version = "1.85.0" keywords = ["futures", "async-cancellation"] categories = ["asynchronous", "no-std::no-alloc"] repository = "https://github.com/oxidecomputer/cancel-safe-futures" diff --git a/src/support.rs b/src/support.rs index b8475dced..c6c3bc45a 100644 --- a/src/support.rs +++ b/src/support.rs @@ -9,7 +9,7 @@ where } // From https://twitter.com/8051Enthusiast/status/1571909110009921538 -extern "C" { +unsafe extern "C" { fn __cancel_safe_external_symbol_that_doesnt_exist(); } diff --git a/tests/integration_tests/join_all_then_try.rs b/tests/integration_tests/join_all_then_try.rs index c3d455e12..4bd51a168 100644 --- a/tests/integration_tests/join_all_then_try.rs +++ b/tests/integration_tests/join_all_then_try.rs @@ -19,7 +19,7 @@ async fn basic() { async fn iter_lifetime() { // In futures-rs version 0.1, this function would fail to typecheck due to an overly // conservative type parameterization of `TryJoinAll`. - fn sizes(bufs: Vec<&[u8]>) -> impl Future, ()>> { + fn sizes(bufs: Vec<&[u8]>) -> impl Future, ()>> + use<> { let iter = bufs.into_iter().map(|b| ok::(b.len())); join_all_then_try(iter) }