rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #20708: aturon/new-int-modules

Browse Source 
Conflicts:
	src/libserialize/lib.rs
This commit is contained in:
Alex Crichton
2015-01-07 17:18:01 -08:00
parent b21a0cee19 321d9ddff2
commit dd38f46d71
35 changed files with 130 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/lib.rs
View File

@@ -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!