diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
| commit | dd38f46d71872fba50833fd22313ef49eb01d079 (patch) | |
| tree | f4306baac76c8869273d49e0dd8da0251df4bc2d /src/libstd/lib.rs | |
| parent | b21a0cee19ab1cdbe57c7f277a9cc9f2658ebce2 (diff) | |
| parent | 321d9ddff21b532300a9ced6ae7ce5f902c0fbf5 (diff) | |
| download | rust-dd38f46d71872fba50833fd22313ef49eb01d079.tar.gz rust-dd38f46d71872fba50833fd22313ef49eb01d079.zip | |
rollup merge of #20708: aturon/new-int-modules
Conflicts: src/libserialize/lib.rs
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 15f279f1b45..c2daa08d4d3 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -109,7 +109,6 @@ #![feature(lang_items, unsafe_destructor)] #![feature(slicing_syntax, unboxed_closures)] #![feature(old_impl_check)] -#![cfg_attr(stage0, allow(unused_attributes))] // Don't link to std. We are std. #![no_std] @@ -154,7 +153,6 @@ pub use core::finally; pub use core::hash; pub use core::intrinsics; pub use core::iter; -#[cfg(stage0)] #[cfg(not(test))] pub use core::marker as kinds; #[cfg(not(test))] pub use core::marker; pub use core::mem; #[cfg(not(test))] pub use core::ops; @@ -205,12 +203,14 @@ mod int_macros; mod uint_macros; #[path = "num/int.rs"] pub mod int; +#[path = "num/isize.rs"] pub mod isize; #[path = "num/i8.rs"] pub mod i8; #[path = "num/i16.rs"] pub mod i16; #[path = "num/i32.rs"] pub mod i32; #[path = "num/i64.rs"] pub mod i64; #[path = "num/uint.rs"] pub mod uint; +#[path = "num/usize.rs"] pub mod usize; #[path = "num/u8.rs"] pub mod u8; #[path = "num/u16.rs"] pub mod u16; #[path = "num/u32.rs"] pub mod u32; @@ -286,8 +286,6 @@ mod std { pub use vec; // used for vec![] pub use cell; // used for tls! pub use thread_local; // used for thread_local! - #[cfg(stage0)] - pub use marker as kinds; pub use marker; // used for tls! pub use ops; // used for bitflags! |