diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 14:53:18 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 14:53:18 -0700 |
| commit | 7ae802f57bf8a1ac2a47760a936c56e6fff16821 (patch) | |
| tree | a6063128be15d8bb988d61b4ce695eafd8fb1ec6 /src/libstd/lib.rs | |
| parent | ebe4da971aa4b2a9db597b682b96133f373dbec5 (diff) | |
| parent | 58bea31ca0e11bf49439d33e1d21f11de7161567 (diff) | |
| download | rust-7ae802f57bf8a1ac2a47760a936c56e6fff16821.tar.gz rust-7ae802f57bf8a1ac2a47760a936c56e6fff16821.zip | |
rollup merge of #17666 : eddyb/take-garbage-out
Conflicts: src/libcollections/lib.rs src/libcore/lib.rs src/librustdoc/lib.rs src/librustrt/lib.rs src/libserialize/lib.rs src/libstd/lib.rs src/test/run-pass/issue-8898.rs
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 7304871cf21..c7e8da09e69 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -105,7 +105,7 @@ html_root_url = "http://doc.rust-lang.org/master/", html_playground_url = "http://play.rust-lang.org/")] -#![feature(macro_rules, globs, managed_boxes, linkage)] +#![feature(macro_rules, globs, linkage)] #![feature(default_type_params, phase, lang_items, unsafe_destructor)] #![feature(import_shadowing)] @@ -136,7 +136,6 @@ extern crate rustrt; #[cfg(test)] pub use realstd::cmp; #[cfg(test)] pub use realstd::ty; #[cfg(test)] pub use realstd::boxed; -#[cfg(test)] pub use realstd::gc; // NB: These reexports are in the order they should be listed in rustdoc @@ -219,9 +218,6 @@ pub mod rand; pub mod ascii; -#[cfg(not(test))] -pub mod gc; - pub mod time; /* Common traits */ |