diff --git a/.cirrus.yml b/.cirrus.yml index 0148ad414d8..03581cb5eb8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*' freebsd_instance: image_family: freebsd-14-2 env: - RUST_STABLE: stable + RUST_STABLE: beta RUST_NIGHTLY: nightly-2025-01-25 RUSTFLAGS: -D warnings diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9816c46a947..d28e3d4164d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ env: RUST_BACKTRACE: 1 RUSTUP_WINDOWS_PATH_ADD_BIN: 1 # Change to specific Rust release to pin - rust_stable: stable + rust_stable: beta rust_nightly: nightly-2025-01-25 # Pin a specific miri version rust_miri_nightly: nightly-2025-01-25 diff --git a/.github/workflows/loom.yml b/.github/workflows/loom.yml index 234b8bfd7e3..4b60bc53736 100644 --- a/.github/workflows/loom.yml +++ b/.github/workflows/loom.yml @@ -17,7 +17,7 @@ env: LOOM_MAX_BRANCHES: 10000 RUST_BACKTRACE: 1 # Change to specific Rust release to pin - rust_stable: stable + rust_stable: beta permissions: contents: read diff --git a/tests-build/tests/fail/macros_type_mismatch.stderr b/tests-build/tests/fail/macros_type_mismatch.stderr index 201df9cdd05..f9c32f00578 100644 --- a/tests-build/tests/fail/macros_type_mismatch.stderr +++ b/tests-build/tests/fail/macros_type_mismatch.stderr @@ -57,8 +57,6 @@ error[E0277]: the `?` operator can only be used in an async block that returns ` 39 | async fn question_mark_operator_with_invalid_option() -> Option<()> { 40 | None?; | ^ cannot use the `?` operator in an async block that returns `()` - | - = help: the trait `FromResidual>` is not implemented for `()` error[E0308]: mismatched types --> tests/fail/macros_type_mismatch.rs:40:5 @@ -87,8 +85,6 @@ error[E0277]: the `?` operator can only be used in an async block that returns ` 56 | async fn question_mark_operator_with_invalid_result() -> Result<(), ()> { 57 | Ok(())?; | ^ cannot use the `?` operator in an async block that returns `()` - | - = help: the trait `FromResidual>` is not implemented for `()` error[E0308]: mismatched types --> tests/fail/macros_type_mismatch.rs:57:5