bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23738: alexcrichton/snapshots

Browse source 
Conflicts:
	src/libcollections/vec.rs
This commit is contained in:
Alex Crichton 2015-03-27 10:08:40 -07:00
commit 956c2eb257
29 changed files with 25 additions and 1166 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/lib.rs
View file

@ -147,9 +147,9 @@ extern crate core;
#[macro_use]
#[macro_reexport(vec, format)]
extern crate "collections" as core_collections;
extern crate collections as core_collections;
#[allow(deprecated)] extern crate "rand" as core_rand;
#[allow(deprecated)] extern crate rand as core_rand;
extern crate alloc;
extern crate unicode;
extern crate libc;
@ -157,7 +157,7 @@ extern crate libc;
#[macro_use] #[no_link] extern crate rustc_bitflags;
// Make std testable by not duplicating lang items. See #2912
#[cfg(test)] extern crate "std" as realstd;
#[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;