Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
rust-version: ["1.64", stable]
rust-version: ["1.85", stable]
fail-fast: false
env:
RUSTFLAGS: -D warnings
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.85.0"
keywords = ["futures", "async-cancellation"]
categories = ["asynchronous", "no-std::no-alloc"]
repository = "https://github.com/oxidecomputer/cancel-safe-futures"
Expand Down
2 changes: 1 addition & 1 deletion scripts/commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/join_all_then_try.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Output = Result<Vec<usize>, ()>> {
fn sizes(bufs: Vec<&[u8]>) -> impl Future<Output = Result<Vec<usize>, ()>> + use<> {
let iter = bufs.into_iter().map(|b| ok::<usize, ()>(b.len()));
join_all_then_try(iter)
}
Expand Down
Loading