From cc97fb8a5ff6ef17f6dc9968fbbe67002cff4130 Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Mon, 1 Feb 2021 15:55:21 +0300 Subject: [PATCH] Suppress deprecated warnings for spin_loop_hint (#3497) * Suppress deprecated warnings for spin_loop_hint * Update tokio/src/loom/std/mod.rs Co-authored-by: Taiki Endo * Update tokio/src/sync/task/atomic_waker.rs Co-authored-by: Taiki Endo * fmt Co-authored-by: Taiki Endo --- tokio/src/loom/std/mod.rs | 5 ++++- tokio/src/sync/task/atomic_waker.rs | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tokio/src/loom/std/mod.rs b/tokio/src/loom/std/mod.rs index c3f74efb73c..b29cbeeb89c 100644 --- a/tokio/src/loom/std/mod.rs +++ b/tokio/src/loom/std/mod.rs @@ -74,7 +74,10 @@ pub(crate) mod sync { pub(crate) use crate::loom::std::atomic_u8::AtomicU8; pub(crate) use crate::loom::std::atomic_usize::AtomicUsize; - pub(crate) use std::sync::atomic::{fence, spin_loop_hint, AtomicBool, Ordering}; + pub(crate) use std::sync::atomic::{fence, AtomicBool, Ordering}; + // TODO: once we bump MSRV to 1.49+, use `hint::spin_loop` instead. + #[allow(deprecated)] + pub(crate) use std::sync::atomic::spin_loop_hint; } } diff --git a/tokio/src/sync/task/atomic_waker.rs b/tokio/src/sync/task/atomic_waker.rs index 06d70cf8ecc..59172041ab7 100644 --- a/tokio/src/sync/task/atomic_waker.rs +++ b/tokio/src/sync/task/atomic_waker.rs @@ -223,6 +223,8 @@ impl AtomicWaker { waker.wake(); // This is equivalent to a spin lock, so use a spin hint. + // TODO: once we bump MSRV to 1.49+, use `hint::spin_loop` instead. + #[allow(deprecated)] atomic::spin_loop_hint(); } state => {