From 64641985087e1aadfa2fcc1c849953b827a9fcd1 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 28 Jul 2015 16:22:05 -0700 Subject: [PATCH] std: Remove some old #[cfg(test) hacks Since most lang items are actually defined in core, these hack reexports don't actually do anything useful. --- src/libstd/lib.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 1e82a03f286..710c3b8075c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -179,28 +179,23 @@ #[macro_use] #[no_link] extern crate rustc_bitflags; -// Make std testable by not duplicating lang items. See #2912 +// Make std testable by not duplicating lang items and other globals. See #2912 #[cfg(test)] extern crate std as realstd; -#[cfg(test)] pub use realstd::marker; -#[cfg(test)] pub use realstd::ops; -#[cfg(test)] pub use realstd::cmp; -#[cfg(test)] pub use realstd::boxed; - // NB: These reexports are in the order they should be listed in rustdoc pub use core::any; pub use core::cell; pub use core::clone; -#[cfg(not(test))] pub use core::cmp; +pub use core::cmp; pub use core::convert; pub use core::default; pub use core::hash; pub use core::intrinsics; pub use core::iter; -#[cfg(not(test))] pub use core::marker; +pub use core::marker; pub use core::mem; -#[cfg(not(test))] pub use core::ops; +pub use core::ops; pub use core::ptr; pub use core::raw; pub use core::simd; @@ -208,7 +203,7 @@ pub use core::option; pub mod error; -#[cfg(not(test))] pub use alloc::boxed; +pub use alloc::boxed; pub use alloc::rc; pub use core_collections::borrow; -- 2.44.0