Remove rename of core to std in nostd builds

src/__private_api.rs

@@ -2,8 +2,8 @@
 
 use self::sealed::KVs;
 use crate::{Level, Metadata, Record};
-use std::fmt::Arguments;
-pub use std::{file, format_args, line, module_path, stringify};
+use core::fmt::Arguments;
+pub use core::{file, format_args, line, module_path, stringify};
 
 #[cfg(feature = "kv_unstable")]
 pub type Value<'a> = dyn crate::kv::value::ToValue + 'a;

src/kv/error.rs

@@ -1,4 +1,4 @@
-use std::fmt;
+use core::fmt;
 
 /// An error encountered while working with structured data.
 #[derive(Debug)]

src/kv/key.rs

@@ -1,7 +1,7 @@
 //! Structured keys.
 
-use std::borrow::Borrow;
-use std::fmt;
+use core::borrow::Borrow;
+use core::fmt;
 
 /// A type that can be converted into a [`Key`](struct.Key.html).
 pub trait ToKey {

src/kv/source.rs

@@ -1,7 +1,7 @@
 //! Sources for key-value pairs.
 
 use crate::kv::{Error, Key, ToKey, ToValue, Value};
-use std::fmt;
+use core::fmt;
 
 /// A source of key-value pairs.
 ///

src/kv/value.rs

@@ -1,6 +1,6 @@
 //! Structured values.
 
-use std::fmt;
+use core::fmt;
 
 pub use crate::kv::Error;
 
@@ -421,13 +421,13 @@ impl ToValue for i128 {
     }
 }
 
-impl ToValue for std::num::NonZeroU128 {
+impl ToValue for core::num::NonZeroU128 {
     fn to_value(&self) -> Value {
         Value::from(self)
     }
 }
 
-impl ToValue for std::num::NonZeroI128 {
+impl ToValue for core::num::NonZeroI128 {
     fn to_value(&self) -> Value {
         Value::from(self)
     }
@@ -451,17 +451,17 @@ impl<'v> From<&'v i128> for Value<'v> {
     }
 }
 
-impl<'v> From<&'v std::num::NonZeroU128> for Value<'v> {
-    fn from(v: &'v std::num::NonZeroU128) -> Value<'v> {
+impl<'v> From<&'v core::num::NonZeroU128> for Value<'v> {
+    fn from(v: &'v core::num::NonZeroU128) -> Value<'v> {
         // SAFETY: `NonZeroU128` and `u128` have the same ABI
-        Value::from_value_bag(unsafe { &*(v as *const std::num::NonZeroU128 as *const u128) })
+        Value::from_value_bag(unsafe { &*(v as *const core::num::NonZeroU128 as *const u128) })
     }
 }
 
-impl<'v> From<&'v std::num::NonZeroI128> for Value<'v> {
-    fn from(v: &'v std::num::NonZeroI128) -> Value<'v> {
+impl<'v> From<&'v core::num::NonZeroI128> for Value<'v> {
+    fn from(v: &'v core::num::NonZeroI128) -> Value<'v> {
         // SAFETY: `NonZeroI128` and `i128` have the same ABI
-        Value::from_value_bag(unsafe { &*(v as *const std::num::NonZeroI128 as *const i128) })
+        Value::from_value_bag(unsafe { &*(v as *const core::num::NonZeroI128 as *const i128) })
     }
 }
 
@@ -504,14 +504,14 @@ macro_rules! impl_to_value_primitive {
 macro_rules! impl_to_value_nonzero_primitive {
     ($($into_ty:ident,)*) => {
         $(
-            impl ToValue for std::num::$into_ty {
+            impl ToValue for ::core::num::$into_ty {
                 fn to_value(&self) -> Value {
                     Value::from(self.get())
                 }
             }
 
-            impl<'v> From<std::num::$into_ty> for Value<'v> {
-                fn from(value: std::num::$into_ty) -> Self {
+            impl<'v> From<::core::num::$into_ty> for Value<'v> {
+                fn from(value: ::core::num::$into_ty) -> Self {
                     Value::from(value.get())
                 }
             }
@@ -783,11 +783,11 @@ pub(crate) mod tests {
             Value::from(32u32),
             Value::from(64u64),
             Value::from(1usize),
-            Value::from(std::num::NonZeroU8::new(8).unwrap()),
-            Value::from(std::num::NonZeroU16::new(16).unwrap()),
-            Value::from(std::num::NonZeroU32::new(32).unwrap()),
-            Value::from(std::num::NonZeroU64::new(64).unwrap()),
-            Value::from(std::num::NonZeroUsize::new(1).unwrap()),
+            Value::from(core::num::NonZeroU8::new(8).unwrap()),
+            Value::from(core::num::NonZeroU16::new(16).unwrap()),
+            Value::from(core::num::NonZeroU32::new(32).unwrap()),
+            Value::from(core::num::NonZeroU64::new(64).unwrap()),
+            Value::from(core::num::NonZeroUsize::new(1).unwrap()),
         ]
         .into_iter()
     }
@@ -799,11 +799,11 @@ pub(crate) mod tests {
             Value::from(-32i32),
             Value::from(-64i64),
             Value::from(-1isize),
-            Value::from(std::num::NonZeroI8::new(-8).unwrap()),
-            Value::from(std::num::NonZeroI16::new(-16).unwrap()),
-            Value::from(std::num::NonZeroI32::new(-32).unwrap()),
-            Value::from(std::num::NonZeroI64::new(-64).unwrap()),
-            Value::from(std::num::NonZeroIsize::new(-1).unwrap()),
+            Value::from(core::num::NonZeroI8::new(-8).unwrap()),
+            Value::from(core::num::NonZeroI16::new(-16).unwrap()),
+            Value::from(core::num::NonZeroI32::new(-32).unwrap()),
+            Value::from(core::num::NonZeroI64::new(-64).unwrap()),
+            Value::from(core::num::NonZeroIsize::new(-1).unwrap()),
         ]
         .into_iter()
     }

src/lib.rs

@@ -340,14 +340,11 @@
 #![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
 #![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
 
-#[cfg(all(not(feature = "std"), not(test)))]
-extern crate core as std;
-
-use std::cfg;
+use core::cfg;
+use core::str::FromStr;
+use core::{cmp, fmt, mem};
 #[cfg(feature = "std")]
 use std::error;
-use std::str::FromStr;
-use std::{cmp, fmt, mem};
 
 #[macro_use]
 mod macros;
@@ -357,12 +354,12 @@ mod serde;
 pub mod kv;
 
 #[cfg(target_has_atomic = "ptr")]
-use std::sync::atomic::{AtomicUsize, Ordering};
+use core::sync::atomic::{AtomicUsize, Ordering};
 
 #[cfg(not(target_has_atomic = "ptr"))]
-use std::cell::Cell;
+use core::cell::Cell;
 #[cfg(not(target_has_atomic = "ptr"))]
-use std::sync::atomic::Ordering;
+use core::sync::atomic::Ordering;
 
 #[cfg(not(target_has_atomic = "ptr"))]
 struct AtomicUsize {
@@ -1375,7 +1372,7 @@ where
             while STATE.load(Ordering::SeqCst) == INITIALIZING {
                 // TODO: replace with `hint::spin_loop` once MSRV is 1.49.0.
                 #[allow(deprecated)]
-                std::sync::atomic::spin_loop_hint();
+                core::sync::atomic::spin_loop_hint();
             }
             Err(SetLoggerError(()))
         }

src/serde.rs

@@ -8,8 +8,8 @@ use serde::ser::{Serialize, Serializer};
 
 use crate::{Level, LevelFilter, LOG_LEVEL_NAMES};
 
-use std::fmt;
-use std::str::{self, FromStr};
+use core::fmt;
+use core::str::{self, FromStr};
 
 // The Deserialize impls are handwritten to be case insensitive using FromStr.