Skip to content

Commit

Permalink
Remove rename of core to std in nostd builds
Browse files Browse the repository at this point in the history
Motivation:
* It is confusing
* It makes work on my other PR (#605) harder
* It makes harder to split nostd and std parts of crate
  • Loading branch information
AngelicosPhosphoros committed Dec 19, 2023
1 parent c5ddd6f commit 5c3bc67
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 40 deletions.
4 changes: 2 additions & 2 deletions src/__private_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/kv/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::fmt;
use core::fmt;

/// An error encountered while working with structured data.
#[derive(Debug)]
Expand Down
4 changes: 2 additions & 2 deletions src/kv/key.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/kv/source.rs
Original file line number Diff line number Diff line change
@@ -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.
///
Expand Down
44 changes: 22 additions & 22 deletions src/kv/value.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Structured values.
use std::fmt;
use core::fmt;

pub use crate::kv::Error;

Expand Down Expand Up @@ -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)
}
Expand All @@ -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) })
}
}

Expand Down Expand Up @@ -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())
}
}
Expand Down Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
17 changes: 7 additions & 10 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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(()))
}
Expand Down
4 changes: 2 additions & 2 deletions src/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 5c3bc67

Please sign in to comment.