Skip to content

Commit 905d23b

Browse files
committed
Move std::sys_common::alloc to std::sys::common
1 parent 3f8adde commit 905d23b

File tree

6 files changed

+5
-3
lines changed

6 files changed

+5
-3
lines changed

library/std/src/sys/common/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod alloc;

library/std/src/sys/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
2323
#![allow(missing_debug_implementations)]
2424

25+
mod common;
26+
2527
cfg_if::cfg_if! {
2628
if #[cfg(target_os = "vxworks")] {
2729
mod vxworks;

library/std/src/sys/unix/alloc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::alloc::{GlobalAlloc, Layout, System};
22
use crate::ptr;
3-
use crate::sys_common::alloc::{realloc_fallback, MIN_ALIGN};
3+
use crate::sys::common::alloc::{realloc_fallback, MIN_ALIGN};
44

55
#[stable(feature = "alloc_system_type", since = "1.28.0")]
66
unsafe impl GlobalAlloc for System {

library/std/src/sys/windows/alloc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::ffi::c_void;
55
use crate::ptr;
66
use crate::sync::atomic::{AtomicPtr, Ordering};
77
use crate::sys::c;
8-
use crate::sys_common::alloc::{realloc_fallback, MIN_ALIGN};
8+
use crate::sys::common::alloc::{realloc_fallback, MIN_ALIGN};
99

1010
#[cfg(test)]
1111
mod tests;

library/std/src/sys_common/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ macro_rules! rtunwrap {
4646
};
4747
}
4848

49-
pub mod alloc;
5049
pub mod at_exit_imp;
5150
pub mod backtrace;
5251
pub mod bytestring;

0 commit comments

Comments
 (0)