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

1
src/librustdoc/lib.rs
View file

@ -52,6 +52,7 @@ extern crate rustc_back;
extern crate serialize;
extern crate syntax;
extern crate "test" as testing;
extern crate unicode;
#[macro_use] extern crate log;
extern crate "serialize" as rustc_serialize; // used by deriving