From 14b59cf37edcf0eaeeb1359c4af97a85697a7c2b Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Mon, 21 Mar 2022 21:04:04 +0900 Subject: [PATCH 1/2] ci: upgrade to new nightly --- .cirrus.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0d58c1e0e8b..29addba95ad 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,7 +2,7 @@ freebsd_instance: image: freebsd-12-2-release-amd64 env: RUST_STABLE: stable - RUST_NIGHTLY: nightly-2022-01-12 + RUST_NIGHTLY: nightly-2022-03-21 RUSTFLAGS: -D warnings # Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf70ebd76e3..84f0d76b988 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: RUST_BACKTRACE: 1 # Change to specific Rust release to pin rust_stable: stable - rust_nightly: nightly-2022-01-12 + rust_nightly: nightly-2022-03-21 rust_clippy: 1.52.0 rust_min: 1.49.0 From a438f3b8d19fc1b59ca3d16b9fa7a3c9bf0d71ff Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Mon, 21 Mar 2022 21:06:57 +0900 Subject: [PATCH 2/2] ci: run reusable_box tests with Miri --- tokio/src/signal/reusable_box.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tokio/src/signal/reusable_box.rs b/tokio/src/signal/reusable_box.rs index 02f32474b16..796fa210b03 100644 --- a/tokio/src/signal/reusable_box.rs +++ b/tokio/src/signal/reusable_box.rs @@ -151,7 +151,6 @@ impl fmt::Debug for ReusableBoxFuture { } #[cfg(test)] -#[cfg(not(miri))] // Miri breaks when you use Pin<&mut dyn Future> mod test { use super::ReusableBoxFuture; use futures::future::FutureExt;