diff options
| author | bors <bors@rust-lang.org> | 2015-03-02 00:37:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-02 00:37:24 +0000 |
| commit | 4b3b02f8f4f57046956d42c4c19d00c7bb260189 (patch) | |
| tree | e10fa9a4a2f6fe235c201d64e560d13e2004493c /src/libstd | |
| parent | 157614249594f187f421cd97f928e64c5ab5c1fa (diff) | |
| parent | 69881574f74177a7aef068fa6dafd1619a76a1d4 (diff) | |
| download | rust-4b3b02f8f4f57046956d42c4c19d00c7bb260189.tar.gz rust-4b3b02f8f4f57046956d42c4c19d00c7bb260189.zip | |
Auto merge of #22940 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index b5bdeb7f181..7957bc35b76 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -109,7 +109,7 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] -#![feature(int_uint)] +#![feature(hash)] #![feature(lang_items)] #![feature(libc)] #![feature(linkage, thread_local, asm)] @@ -221,14 +221,12 @@ mod int_macros; mod uint_macros; #[path = "num/isize.rs"] pub mod isize; -pub use isize as int; #[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/usize.rs"] pub mod usize; -pub use usize as uint; #[path = "num/u8.rs"] pub mod u8; #[path = "num/u16.rs"] pub mod u16; #[path = "num/u32.rs"] pub mod u32; |