diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-30 01:43:53 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-30 01:43:53 +0530 |
| commit | 35d95515f3de27c0e1a7d67893fcad8d0ad6fac9 (patch) | |
| tree | f5b208ce1ba0087a6e27e9f80c693b64964ec953 /src/libstd | |
| parent | c9a34d209283304732fe2eb2fe3dee3c1afd1488 (diff) | |
| parent | 64641985087e1aadfa2fcc1c849953b827a9fcd1 (diff) | |
| download | rust-35d95515f3de27c0e1a7d67893fcad8d0ad6fac9.tar.gz rust-35d95515f3de27c0e1a7d67893fcad8d0ad6fac9.zip | |
Rollup merge of #27369 - brson:realstd, r=alexcrichton
Since most lang items are actually defined in core, these hack reexports don't actually do anything useful.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 3d3a46e61d5..16491549705 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -281,28 +281,23 @@ extern crate libc; #[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; @@ -310,7 +305,7 @@ pub use core::result; 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; |