Replace stdlib module with direct std imports

… except std::sync::Mutex, which there is a polyfill for.

Author: jplatte

tracing-core/src/callsite.rs

@@ -96,26 +96,25 @@
 //! [`Dispatch`]: crate::dispatcher::Dispatch
 //! [macros]: https://docs.rs/tracing/latest/tracing/#macros
 //! [instrument]: https://docs.rs/tracing/latest/tracing/attr.instrument.html
-use crate::stdlib::{
+
+use alloc::vec::Vec;
+use core::{
     any::TypeId,
     fmt,
     hash::{Hash, Hasher},
     ptr,
-    sync::{
-        atomic::{AtomicBool, AtomicPtr, AtomicU8, Ordering},
-        Mutex,
-    },
-    vec::Vec,
+    sync::atomic::{AtomicBool, AtomicPtr, AtomicU8, Ordering},
 };
+
+use self::dispatchers::Dispatchers;
 use crate::{
     dispatcher::Dispatch,
     lazy::Lazy,
     metadata::{LevelFilter, Metadata},
     subscriber::Interest,
+    sync::Mutex,
 };
 
-use self::dispatchers::Dispatchers;
-
 /// Trait implemented by callsites.
 ///
 /// These functions are only intended to be called by the callsite registry, which

tracing-core/src/dispatcher.rs

@@ -131,17 +131,15 @@ use crate::{
     Event, LevelFilter, Metadata,
 };
 
-use crate::stdlib::{
+use alloc::sync::{Arc, Weak};
+use core::{
     any::Any,
     fmt,
-    sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
-        Arc, Weak,
-    },
+    sync::atomic::{AtomicBool, AtomicUsize, Ordering},
 };
 
 #[cfg(feature = "std")]
-use crate::stdlib::{
+use std::{
     cell::{Cell, Ref, RefCell},
     error,
 };
@@ -904,9 +902,10 @@ impl Drop for DefaultGuard {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     #[cfg(feature = "std")]
-    use crate::stdlib::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    use super::*;
     use crate::{
         callsite::Callsite,
         metadata::{Kind, Level, Metadata},

tracing-core/src/field.rs

@@ -109,17 +109,18 @@
 //! [`record`]: super::subscriber::Subscriber::record
 //! [`event`]:  super::subscriber::Subscriber::event
 //! [`Value::record`]: Value::record
-use crate::callsite;
-use crate::stdlib::{
+
+use alloc::{boxed::Box, string::String};
+use core::{
     borrow::Borrow,
     fmt::{self, Write},
     hash::{Hash, Hasher},
     num,
     ops::Range,
-    string::String,
 };
 
 use self::private::ValidLen;
+use crate::callsite;
 
 /// An opaque key allowing _O_(1) access to a field in a `Span`'s key-value
 /// data.
@@ -649,9 +650,9 @@ impl Value for fmt::Arguments<'_> {
     }
 }
 
-impl<T: ?Sized> crate::sealed::Sealed for crate::stdlib::boxed::Box<T> where T: Value {}
+impl<T: ?Sized> crate::sealed::Sealed for Box<T> where T: Value {}
 
-impl<T: ?Sized> Value for crate::stdlib::boxed::Box<T>
+impl<T: ?Sized> Value for Box<T>
 where
     T: Value,
 {
@@ -1120,12 +1121,11 @@ mod private {
 
 #[cfg(test)]
 mod test {
-    use alloc::boxed::Box;
+    use alloc::{borrow::ToOwned, boxed::Box, string::String};
     use std::format;
 
     use super::*;
     use crate::metadata::{Kind, Level, Metadata};
-    use crate::stdlib::{borrow::ToOwned, string::String};
 
     // Make sure TEST_CALLSITE_* have non-zero size, so they can't be located at the same address.
     struct TestCallsite1();
@@ -1238,7 +1238,7 @@ mod test {
 
         struct MyVisitor;
         impl Visit for MyVisitor {
-            fn record_debug(&mut self, field: &Field, _: &dyn (crate::stdlib::fmt::Debug)) {
+            fn record_debug(&mut self, field: &Field, _: &dyn (fmt::Debug)) {
                 assert_eq!(field.callsite(), TEST_META_1.callsite())
             }
         }
@@ -1257,7 +1257,7 @@ mod test {
 
         struct MyVisitor;
         impl Visit for MyVisitor {
-            fn record_debug(&mut self, field: &Field, _: &dyn (crate::stdlib::fmt::Debug)) {
+            fn record_debug(&mut self, field: &Field, _: &dyn (fmt::Debug)) {
                 assert_eq!(field.name(), "bar")
             }
         }
@@ -1276,7 +1276,7 @@ mod test {
         let valueset = fields.value_set(values);
         let mut result = String::new();
         valueset.record(&mut |_: &Field, value: &dyn fmt::Debug| {
-            use crate::stdlib::fmt::Write;
+            use core::fmt::Write;
             write!(&mut result, "{:?}", value).unwrap();
         });
         assert_eq!(result, "123".to_owned());

tracing-core/src/lib.rs

@@ -277,7 +277,7 @@ pub(crate) mod spin;
 pub type Once = self::spin::Once<()>;
 
 #[cfg(feature = "std")]
-pub use stdlib::sync::Once;
+pub use std::sync::Once;
 
 pub mod callsite;
 pub mod dispatcher;
@@ -286,8 +286,12 @@ pub mod field;
 pub mod metadata;
 mod parent;
 pub mod span;
-pub(crate) mod stdlib;
 pub mod subscriber;
+#[cfg(not(feature = "std"))]
+mod sync;
+
+#[cfg(feature = "std")]
+pub(crate) use std::sync;
 
 #[doc(inline)]
 pub use self::{

tracing-core/src/metadata.rs

@@ -1,6 +1,6 @@
 //! Metadata describing trace data.
 use super::{callsite, field};
-use crate::stdlib::{
+use core::{
     cmp, fmt,
     str::FromStr,
     sync::atomic::{AtomicUsize, Ordering},
@@ -548,7 +548,7 @@ impl fmt::Display for Level {
 
 #[cfg(feature = "std")]
 #[cfg_attr(docsrs, doc(cfg(feature = "std")))]
-impl crate::stdlib::error::Error for ParseLevelError {}
+impl std::error::Error for ParseLevelError {}
 
 impl FromStr for Level {
     type Err = ParseLevelError;
@@ -729,7 +729,7 @@ impl LevelFilter {
                 // the inputs to `set_max` to the set of valid discriminants.
                 // Therefore, **as long as `MAX_VALUE` is only ever set by
                 // `set_max`**, this is safe.
-                crate::stdlib::hint::unreachable_unchecked()
+                core::hint::unreachable_unchecked()
             },
         }
     }
@@ -1047,7 +1047,7 @@ impl PartialOrd<Level> for LevelFilter {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::stdlib::mem;
+    use core::mem;
 
     #[test]
     fn level_from_str() {

tracing-core/src/span.rs

@@ -1,7 +1,9 @@
 //! Spans represent periods of time in the execution of a program.
+
+use core::num::NonZeroU64;
+
 use crate::field::FieldSet;
 use crate::parent::Parent;
-use crate::stdlib::num::NonZeroU64;
 use crate::{field, Metadata};
 
 /// Identifies a span within the context of a subscriber.

tracing-core/src/stdlib.rs

@@ -1,11 +1,8 @@
 //! Collectors collect and record trace data.
 use crate::{span, Dispatch, Event, LevelFilter, Metadata};
 
-use crate::stdlib::{
-    any::{Any, TypeId},
-    boxed::Box,
-    sync::Arc,
-};
+use alloc::{boxed::Box, sync::Arc};
+use core::any::{Any, TypeId};
 
 /// Trait representing the functions required to collect trace data.
 ///

tracing-core/src/subscriber.rs

@@ -0,0 +1,23 @@
+pub(crate) use crate::spin::MutexGuard;
+
+/// This wraps `spin::Mutex` to return a `Result`, so that it can be
+/// used with code written against `std::sync::Mutex`.
+///
+/// Since `spin::Mutex` doesn't support poisoning, the `Result` returned
+/// by `lock` will always be `Ok`.
+#[derive(Debug, Default)]
+pub(crate) struct Mutex<T> {
+    inner: crate::spin::Mutex<T>,
+}
+
+impl<T> Mutex<T> {
+    // pub(crate) fn new(data: T) -> Self {
+    //     Self {
+    //         inner: crate::spin::Mutex::new(data),
+    //     }
+    // }
+
+    pub(crate) fn lock(&self) -> Result<MutexGuard<'_, T>, ()> {
+        Ok(self.inner.lock())
+    }
+}