diff options
Diffstat (limited to 'tokio/src/net/driver')
| -rw-r--r-- | tokio/src/net/driver/mod.rs | 4 | ||||
| -rw-r--r-- | tokio/src/net/driver/reactor/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tokio/src/net/driver/mod.rs b/tokio/src/net/driver/mod.rs index b7f33d02..2b3afc7d 100644 --- a/tokio/src/net/driver/mod.rs +++ b/tokio/src/net/driver/mod.rs @@ -124,12 +124,12 @@ //! [`PollEvented`]: struct.PollEvented.html //! [`std::io::Read`]: https://doc.rust-lang.org/std/io/trait.Read.html //! [`std::io::Write`]: https://doc.rust-lang.org/std/io/trait.Write.html -#[cfg(loom)] +#[cfg(all(loom, test))] macro_rules! loom_thread_local { ($($tts:tt)+) => { loom::thread_local!{ $($tts)+ } } } -#[cfg(not(loom))] +#[cfg(any(not(loom), not(test)))] macro_rules! loom_thread_local { ($($tts:tt)+) => { std::thread_local!{ $($tts)+ } } } diff --git a/tokio/src/net/driver/reactor/mod.rs b/tokio/src/net/driver/reactor/mod.rs index 44443d35..a5325f7d 100644 --- a/tokio/src/net/driver/reactor/mod.rs +++ b/tokio/src/net/driver/reactor/mod.rs @@ -1,4 +1,5 @@ use super::platform; +use crate::executor::park::{Park, Unpark}; use crate::loom::atomic::{AtomicUsize, Ordering::SeqCst}; mod dispatch; @@ -15,7 +16,6 @@ use std::sync::{Arc, Weak}; use std::task::Waker; use std::time::Duration; use std::{fmt, usize}; -use tokio_executor::park::{Park, Unpark}; /// The core reactor, or event loop. /// |