diff --git a/tracing-core/src/lib.rs b/tracing-core/src/lib.rs index a9ef0cd10a..6f10fa2908 100644 --- a/tracing-core/src/lib.rs +++ b/tracing-core/src/lib.rs @@ -255,8 +255,8 @@ pub(crate) mod spin; #[cfg(feature = "std")] mod sync { - pub(crate) use std::sync::{Mutex, MutexGuard}; pub use std::sync::Once; + pub(crate) use std::sync::{Mutex, MutexGuard}; } #[doc(hidden)] diff --git a/tracing-futures/src/executor/futures_preview.rs b/tracing-futures/src/executor/futures_preview.rs index ab9178035c..fec9e3fadb 100644 --- a/tracing-futures/src/executor/futures_preview.rs +++ b/tracing-futures/src/executor/futures_preview.rs @@ -1,5 +1,5 @@ -use core::future::Future; use crate::{Instrument, Instrumented, WithDispatch}; +use core::future::Future; use futures_core_preview::{ future::FutureObj, task::{LocalSpawn, Spawn, SpawnError}, diff --git a/tracing/src/instrument.rs b/tracing/src/instrument.rs index 9cdff1f540..ee53b99746 100644 --- a/tracing/src/instrument.rs +++ b/tracing/src/instrument.rs @@ -1,7 +1,7 @@ +use crate::{dispatcher, span::Span, Dispatch}; use core::pin::Pin; use core::task::{Context, Poll}; use core::{future::Future, marker::Sized}; -use crate::{dispatcher, span::Span, Dispatch}; use pin_project_lite::pin_project; /// Attaches spans to a `std::future::Future`. diff --git a/tracing/src/lib.rs b/tracing/src/lib.rs index 786747dc90..3c4db78e6e 100644 --- a/tracing/src/lib.rs +++ b/tracing/src/lib.rs @@ -913,9 +913,9 @@ pub mod subscriber; #[doc(hidden)] pub mod __macro_support { pub use crate::callsite::{Callsite, Registration}; - use core::sync::atomic::{AtomicUsize, Ordering}; - use core::fmt; use crate::{subscriber::Interest, Metadata}; + use core::fmt; + use core::sync::atomic::{AtomicUsize, Ordering}; use tracing_core::Once; /// Callsite implementation used by macro-generated code. diff --git a/tracing/src/span.rs b/tracing/src/span.rs index bece5a6a36..86af4cfa06 100644 --- a/tracing/src/span.rs +++ b/tracing/src/span.rs @@ -315,15 +315,15 @@ //! [parent]: #span-relationships pub use tracing_core::span::{Attributes, Id, Record}; +use crate::{ + dispatcher::{self, Dispatch}, + field, Metadata, +}; use core::{ cmp, fmt, hash::{Hash, Hasher}, marker::PhantomData, }; -use crate::{ - dispatcher::{self, Dispatch}, - field, Metadata, -}; /// Trait implemented by types which have a span `Id`. pub trait AsId: crate::sealed::Sealed {