From e241ea955642ef1c71124ee0967a08f6e57c778e Mon Sep 17 00:00:00 2001 From: Blas Rodriguez Irizar Date: Fri, 8 Jan 2021 10:43:05 +0100 Subject: [PATCH 1/2] builder: disable io and timer running w/ miri Fixes: #3360 --- tokio/src/runtime/builder.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tokio/src/runtime/builder.rs b/tokio/src/runtime/builder.rs index 1f8892eafc8..d2f4b6638df 100644 --- a/tokio/src/runtime/builder.rs +++ b/tokio/src/runtime/builder.rs @@ -459,10 +459,16 @@ cfg_io_driver! { /// .build() /// .unwrap(); /// ``` + #[cfg(not(miri))] pub fn enable_io(&mut self) -> &mut Self { self.enable_io = true; self } + + #[cfg(miri)] + pub fn enable_io(&mut self) -> &mut Self { + self + } } } @@ -482,10 +488,17 @@ cfg_time! { /// .build() /// .unwrap(); /// ``` + #[cfg(not(miri))] pub fn enable_time(&mut self) -> &mut Self { self.enable_time = true; self } + + #[cfg(miri)] + pub fn enable_time(&mut self) -> &mut Self { + self + } + } } From 1f06dd8db0f17ef0eceb6361fa5ab193bf5f07fc Mon Sep 17 00:00:00 2001 From: Blas Rodriguez Irizar Date: Fri, 8 Jan 2021 10:49:11 +0100 Subject: [PATCH 2/2] doc no-op on miri --- tokio/src/runtime/builder.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tokio/src/runtime/builder.rs b/tokio/src/runtime/builder.rs index d2f4b6638df..8831c7a3fa1 100644 --- a/tokio/src/runtime/builder.rs +++ b/tokio/src/runtime/builder.rs @@ -465,6 +465,7 @@ cfg_io_driver! { self } + /// No-op on Miri #[cfg(miri)] pub fn enable_io(&mut self) -> &mut Self { self @@ -494,6 +495,7 @@ cfg_time! { self } + /// No-op on Miri #[cfg(miri)] pub fn enable_time(&mut self) -> &mut Self { self