Skip to content

Commit 31062b7

Browse files
committed
MSRV 1.85, Rust 2024
Created using spr 1.3.6-beta.1
1 parent 329fcaf commit 31062b7

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
os: [ubuntu-latest]
41-
rust-version: ["1.71", stable]
41+
rust-version: ["1.85", stable]
4242
fail-fast: false
4343
env:
4444
RUSTFLAGS: -D warnings

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
license = "MIT OR Apache-2.0"
66
description = "Alternative futures adapters that are more cancellation-aware"
77
readme = "README.md"
8-
rust-version = "1.71.0"
8+
rust-version = "1.85.0"
99
keywords = ["futures", "async-cancellation"]
1010
categories = ["asynchronous", "no-std::no-alloc"]
1111
repository = "https://github.com/oxidecomputer/cancel-safe-futures"

src/support.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ where
99
}
1010

1111
// From https://twitter.com/8051Enthusiast/status/1571909110009921538
12-
extern "C" {
12+
unsafe extern "C" {
1313
fn __cancel_safe_external_symbol_that_doesnt_exist();
1414
}
1515

tests/integration_tests/join_all_then_try.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async fn basic() {
1919
async fn iter_lifetime() {
2020
// In futures-rs version 0.1, this function would fail to typecheck due to an overly
2121
// conservative type parameterization of `TryJoinAll`.
22-
fn sizes(bufs: Vec<&[u8]>) -> impl Future<Output = Result<Vec<usize>, ()>> {
22+
fn sizes(bufs: Vec<&[u8]>) -> impl Future<Output = Result<Vec<usize>, ()>> + use<> {
2323
let iter = bufs.into_iter().map(|b| ok::<usize, ()>(b.len()));
2424
join_all_then_try(iter)
2525
}

0 commit comments

Comments
 (0)