chore: test more features with Miri

.cirrus.yml

@@ -4,7 +4,7 @@ freebsd_instance:
   image_family: freebsd-12-4
 env:
   RUST_STABLE: stable
-  RUST_NIGHTLY: nightly-2022-10-25
+  RUST_NIGHTLY: nightly-2023-02-13
   RUSTFLAGS: -D warnings
 
 # Test FreeBSD in a full VM on cirrus-ci.com.  Test the i686 target too, in the

.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-11-03
+  rust_nightly: nightly-2023-02-13
   rust_clippy: 1.65.0
   # When updating this, also update:
   # - README.md
@@ -202,10 +202,14 @@ jobs:
           toolchain: ${{ env.rust_nightly }}
           components: miri
       - uses: Swatinem/rust-cache@v2
+      - run: |
+          echo '[patch.crates-io]' >>Cargo.toml
+          echo 'parking_lot_core = { git = "https://github.com/taiki-e/parking_lot.git", branch = "strict-provenance" }' >>Cargo.toml
+          git diff
+          cargo update
       - name: miri
-        # Many of tests in tokio/tests and doctests use #[tokio::test] or
-        # #[tokio::main] that calls epoll_create1 that Miri does not support.
-        run: cargo miri test --features full --lib --no-fail-fast
+        # Ignore doctest because many features don't work with Miri yet.
+        run: cargo miri test --features full --no-fail-fast --tests
         working-directory: tokio
         env:
           MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-strict-provenance -Zmiri-retag-fields

tokio/src/process/unix/orphan.rs

@@ -291,8 +291,8 @@ pub(crate) mod test {
         drop(signal_guard);
     }
 
-    #[cfg_attr(miri, ignore)] // Miri does not support epoll.
     #[test]
+    #[cfg_attr(miri, ignore)] // Miri doesn't support sigaction
     fn does_not_register_signal_if_queue_empty() {
         let (io_driver, io_handle) = IoDriver::new(1024).unwrap();
         let signal_driver = SignalDriver::new(io_driver, &io_handle).unwrap();

tokio/tests/buffered.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support bind()
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use tokio::net::TcpListener;
 use tokio_test::assert_ok;

tokio/tests/fs.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support file operations
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 use tokio::fs;
 use tokio_test::assert_ok;

tokio/tests/fs_copy.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support file operations
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 use tempfile::tempdir;
 use tokio::fs;

tokio/tests/fs_dir.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support directory operations
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 use tokio::fs;
 use tokio_test::{assert_err, assert_ok};

tokio/tests/fs_file.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support file operations
+#![cfg(not(miri))] // Miri doesn't support creating file with non-default mode (inside NamedTempFile::new): https://github.com/rust-lang/miri/pull/2720
 
 use std::io::prelude::*;
 use tempfile::NamedTempFile;

tokio/tests/fs_link.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support file operations
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 use tokio::fs;
 

tokio/tests/io_async_fd.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(unix, feature = "full"))]
+#![cfg(not(miri))] // Miri doesn't support 0x3 command for fcntl
 
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::sync::{

tokio/tests/io_buf_reader.rs

@@ -223,6 +223,7 @@ async fn test_short_reads() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending() {
     let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
     let mut reader = BufReader::with_capacity(2, MaybePending::new(inner));
@@ -260,6 +261,7 @@ async fn maybe_pending() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending_buf_read() {
     let inner = MaybePending::new(&[0, 1, 2, 3, 1, 0]);
     let mut reader = BufReader::with_capacity(2, inner);
@@ -279,6 +281,7 @@ async fn maybe_pending_buf_read() {
 
 // https://github.com/rust-lang/futures-rs/pull/1573#discussion_r281162309
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending_seek() {
     struct MaybePendingSeek<'a> {
         inner: Cursor<&'a [u8]>,

tokio/tests/io_buf_writer.rs

@@ -132,6 +132,7 @@ async fn buf_writer_seek() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending_buf_writer() {
     let mut writer = BufWriter::with_capacity(2, MaybePending::new(Vec::new()));
 
@@ -180,6 +181,7 @@ async fn maybe_pending_buf_writer() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending_buf_writer_inner_flushes() {
     let mut w = BufWriter::with_capacity(3, MaybePending::new(Vec::new()));
     assert_eq!(w.write(&[0, 1]).await.unwrap(), 2);
@@ -190,6 +192,7 @@ async fn maybe_pending_buf_writer_inner_flushes() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn maybe_pending_buf_writer_seek() {
     struct MaybePendingSeek {
         inner: Cursor<Vec<u8>>,

tokio/tests/io_copy.rs

@@ -38,6 +38,7 @@ async fn copy() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn proxy() {
     struct BufferedWd {
         buf: BytesMut,

tokio/tests/io_copy_bidirectional.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support bind()
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use std::time::Duration;
 use tokio::io::{self, copy_bidirectional, AsyncReadExt, AsyncWriteExt};

tokio/tests/io_driver.rs

@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 // Wasi does not support panic recovery or threading
 #![cfg(all(feature = "full", not(tokio_wasi)))]
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use tokio::net::TcpListener;
 use tokio::runtime;

tokio/tests/io_driver_drop.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support bind
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use tokio::net::TcpListener;
 use tokio::runtime;

tokio/tests/io_fill_buf.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support file operations
+#![cfg(not(miri))] // Miri doesn't support creating file with non-default mode (inside NamedTempFile::new): https://github.com/rust-lang/miri/pull/2720
 
 use tempfile::NamedTempFile;
 use tokio::fs::File;

tokio/tests/io_mem_stream.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
+#![cfg(not(miri))] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 
 use tokio::io::{duplex, AsyncReadExt, AsyncWriteExt};
 

tokio/tests/io_util_empty.rs

@@ -1,7 +1,9 @@
 #![cfg(feature = "full")]
+
 use tokio::io::{AsyncBufReadExt, AsyncReadExt};
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn empty_read_is_cooperative() {
     tokio::select! {
         biased;
@@ -17,6 +19,7 @@ async fn empty_read_is_cooperative() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn empty_buf_reads_are_cooperative() {
     tokio::select! {
         biased;

tokio/tests/join_handle_panic.rs

@@ -10,6 +10,7 @@ impl Drop for PanicsOnDrop {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn test_panics_do_not_propagate_when_dropping_join_handle() {
     let join_handle = tokio::spawn(async move { PanicsOnDrop });
 

tokio/tests/macros_join.rs

@@ -111,6 +111,7 @@ async fn poor_little_task(permits: Arc<Semaphore>) -> usize {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn join_does_not_allow_tasks_to_starve() {
     let permits = Arc::new(Semaphore::new(1));
 
@@ -125,6 +126,7 @@ async fn join_does_not_allow_tasks_to_starve() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support epoll_wait
 async fn a_different_future_is_polled_first_every_time_poll_fn_is_polled() {
     let poll_order = Arc::new(std::sync::Mutex::new(vec![]));
 

tokio/tests/macros_rename_test.rs

@@ -1,4 +1,5 @@
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi doesn't support threading
+#![cfg(not(miri))] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 
 #[allow(unused_imports)]
 use std as tokio;

tokio/tests/macros_select.rs

@@ -127,6 +127,7 @@ async fn one_ready() {
 
 #[maybe_tokio_test]
 #[cfg(feature = "full")]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn select_streams() {
     use tokio::sync::mpsc;
 

tokio/tests/macros_test.rs

@@ -3,11 +3,13 @@
 use tokio::test;
 
 #[test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn test_macro_can_be_used_via_use() {
     tokio::spawn(async {}).await.unwrap();
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn test_macro_is_resilient_to_shadowing() {
     tokio::spawn(async {}).await.unwrap();
 }

tokio/tests/macros_try_join.rs

@@ -139,6 +139,7 @@ async fn poor_little_task(permits: Arc<Semaphore>) -> Result<usize, String> {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 async fn try_join_does_not_allow_tasks_to_starve() {
     let permits = Arc::new(Semaphore::new(10));
 
@@ -155,6 +156,7 @@ async fn try_join_does_not_allow_tasks_to_starve() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support epoll_wait
 async fn a_different_future_is_polled_first_every_time_poll_fn_is_polled() {
     let poll_order = Arc::new(std::sync::Mutex::new(vec![]));
 

tokio/tests/net_bind_resource.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi doesn't support panic recovery or bind
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use tokio::net::TcpListener;
 

tokio/tests/net_lookup_host.rs

@@ -23,6 +23,7 @@ async fn lookup_str_socket_addr() {
 }
 
 #[tokio::test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support getaddrinfo
 async fn resolve_dns() -> io::Result<()> {
     let mut hosts = net::lookup_host("localhost:3000").await?;
     let host = hosts.next().unwrap();

tokio/tests/net_panic.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))]
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use std::error::Error;
 use tokio::net::{TcpListener, TcpStream};

tokio/tests/no_rt.rs

@@ -1,4 +1,5 @@
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi does not support panic recovery
+#![cfg(not(miri))] // Miri doesn't support socket
 
 use tokio::net::TcpStream;
 use tokio::sync::oneshot;

tokio/tests/process_arg0.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", unix))]
+#![cfg(not(miri))] // Miri doesn't support pipe2
 
 use tokio::process::Command;
 

tokio/tests/process_issue_2174.rs

@@ -8,6 +8,7 @@
 // `EV_EOF` or `EV_ERROR` flag set. If either flag is set a write would be
 // attempted, but that does not seem to occur.
 #![cfg(all(unix, not(target_os = "freebsd")))]
+#![cfg(not(miri))] // Miri doesn't support pipe2
 
 use std::process::Stdio;
 use std::time::Duration;

tokio/tests/process_issue_42.rs

@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 #![cfg(unix)]
+#![cfg(not(miri))] // Miri doesn't support gnu_get_libc_version
 
 use futures::future::join_all;
 use std::process::Stdio;

tokio/tests/process_kill_on_drop.rs

@@ -1,5 +1,6 @@
 #![cfg(all(unix, feature = "process"))]
 #![warn(rust_2018_idioms)]
+#![cfg(not(miri))] // Miri doesn't support pipe2
 
 use std::io::ErrorKind;
 use std::process::Stdio;

tokio/tests/process_smoke.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))] // Wasi cannot run system commands
+#![cfg(not(miri))] // Miri doesn't support gnu_get_libc_version
 
 use tokio::process::Command;
 use tokio_test::assert_ok;

tokio/tests/rt_basic.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
+#![cfg(not(miri))] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 
 use tokio::runtime::Runtime;
 use tokio::sync::oneshot;

tokio/tests/rt_common.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::needless_range_loop)]
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 // Tests to run on both current-thread & multi-thread runtime variants.
 

tokio/tests/rt_handle_block_on.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 // All io tests that deal with shutdown is currently ignored because there are known bugs in with
 // shutting down the io driver while concurrently registering new resources. See

tokio/tests/rt_panic.rs

@@ -24,6 +24,7 @@ fn current_handle_panic_caller() -> Result<(), Box<dyn Error>> {
 }
 
 #[test]
+#[cfg_attr(miri, ignore)] // Miri doesn't support write to event (inside mio::waker::Waker::wake)
 fn into_panic_panic_caller() -> Result<(), Box<dyn Error>> {
     let panic_location_file = test_panic(move || {
         let rt = current_thread();

tokio/tests/rt_threaded.rs

@@ -1,5 +1,6 @@
 #![warn(rust_2018_idioms)]
 #![cfg(all(feature = "full", not(tokio_wasi)))]
+#![cfg(not(miri))] // Miri doesn't support epoll_wait
 
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};

tokio/tests/signal_ctrl_c.rs

@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 #![cfg(unix)]
+#![cfg(not(miri))] // Miri doesn't support sigaction
 
 mod support {
     pub mod signal;

tokio/tests/signal_drop_recv.rs

@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 #![cfg(unix)]
+#![cfg(not(miri))] // Miri doesn't support sigaction
 
 mod support {
     pub mod signal;

tokio/tests/signal_drop_rt.rs

@@ -1,6 +1,7 @@
 #![warn(rust_2018_idioms)]
 #![cfg(feature = "full")]
 #![cfg(unix)]
+#![cfg(not(miri))] // Miri doesn't support sigaction
 
 mod support {
     pub mod signal;