bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23598: brson/gate

Browse source 
Conflicts:
	src/compiletest/compiletest.rs
	src/libcollections/lib.rs
	src/librustc_back/lib.rs
	src/libserialize/lib.rs
	src/libstd/lib.rs
	src/libtest/lib.rs
	src/test/run-make/rustdoc-default-impl/foo.rs
	src/test/run-pass/env-home-dir.rs
This commit is contained in:
Alex Crichton 2015-03-23 15:13:15 -07:00
commit c608084ff5
1839 changed files with 4533 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstd/lib.rs
View file

@ -105,6 +105,7 @@
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://doc.rust-lang.org/nightly/",
html_playground_url = "http://play.rust-lang.org/")]
#![doc(test(no_crate_inject))]
#![feature(alloc)]
#![feature(box_syntax)]
@ -130,7 +131,7 @@
#![feature(allow_internal_unstable)]
#![feature(str_char)]
#![feature(into_cow)]
#![cfg_attr(test, feature(test, rustc_private))]
#![cfg_attr(test, feature(test, rustc_private, std_misc))]
// Don't link to std. We are std.
#![feature(no_std)]