CR feedback

tokio/src/runtime/handle.rs

@@ -1,6 +1,6 @@
 #[cfg(tokio_unstable)]
 use crate::runtime;
-use crate::runtime::{context, scheduler, RuntimeFlavor};
+use crate::runtime::{context, scheduler, RuntimeFlavor, RuntimeMetrics};
 
 /// Handle to the runtime.
 ///
@@ -22,8 +22,6 @@ use std::future::Future;
 use std::marker::PhantomData;
 use std::{error, fmt};
 
-use super::RuntimeMetrics;
-
 /// Runtime context guard.
 ///
 /// Returned by [`Runtime::enter`] and [`Handle::enter`], the context guard exits

tokio/src/runtime/metrics/histogram.rs

@@ -1,5 +1,5 @@
-use crate::loom::sync::atomic::Ordering::Relaxed;
 use crate::util::metric_atomics::MetricAtomicU64;
+use std::sync::atomic::Ordering::Relaxed;
 
 use std::cmp;
 use std::ops::Range;

tokio/src/runtime/metrics/io.rs

@@ -1,6 +1,7 @@
 #![cfg_attr(not(feature = "net"), allow(dead_code))]
 
-use crate::{loom::sync::atomic::Ordering::Relaxed, util::metric_atomics::MetricAtomicU64};
+use crate::util::metric_atomics::MetricAtomicU64;
+use std::sync::atomic::Ordering::Relaxed;
 
 #[derive(Default)]
 pub(crate) struct IoDriverMetrics {

tokio/src/runtime/metrics/worker.rs

@@ -1,6 +1,8 @@
 use crate::runtime::metrics::Histogram;
 use crate::runtime::Config;
 use crate::util::metric_atomics::MetricAtomicU64;
+// This is NOT the Loom atomic. To avoid an unnecessary state explosion in loom,
+// all metrics use regular atomics.
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::Relaxed;