diff options
| author | bors <bors@rust-lang.org> | 2015-02-08 00:24:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-08 00:24:03 +0000 |
| commit | 74b8740719c1b427f79b67d6bc51e9d448dd9c49 (patch) | |
| tree | 51327a08df4c0f510c0a851c41a6e400645afc97 /src/liballoc | |
| parent | bfaa1a8434de3991d9ceae3eea88674a74c5eef2 (diff) | |
| parent | 312f8bd850ca4d575b1414badabab4f5aee99c67 (diff) | |
| download | rust-74b8740719c1b427f79b67d6bc51e9d448dd9c49.tar.gz rust-74b8740719c1b427f79b67d6bc51e9d448dd9c49.zip | |
Auto merge of #21988 - kmcallister:no-std, r=sfackler
Fixes #21833. [breaking-change] r? @alexcrichton The tests in #21912 will also need `#[feature(no_std)]`. If you're okay with both PRs, I can merge and test them.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index d99a5e2cc6d..81391fd63eb 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -65,6 +65,7 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] +#![feature(no_std)] #![no_std] #![feature(lang_items, unsafe_destructor)] #![feature(box_syntax)] @@ -126,7 +127,8 @@ pub fn oom() -> ! { #[doc(hidden)] pub fn fixme_14344_be_sure_to_link_to_collections() {} -#[cfg(not(test))] +// NOTE: remove after next snapshot +#[cfg(all(stage0, not(test)))] #[doc(hidden)] mod std { pub use core::fmt; |