diff options
| author | bors <bors@rust-lang.org> | 2014-07-10 03:21:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-10 03:21:30 +0000 |
| commit | 898701cb35833b2ecea8bc7f3902a35b7eccc219 (patch) | |
| tree | 76384e124ead2910a08b688c43b26f05ee68e437 /src/libstd | |
| parent | 18520699f0c40d347fe1bde00d4f1c822f1bb28d (diff) | |
| parent | 0c71e0c5967c4650c617dfc5cc11152b0e08370c (diff) | |
| download | rust-898701cb35833b2ecea8bc7f3902a35b7eccc219.tar.gz rust-898701cb35833b2ecea8bc7f3902a35b7eccc219.zip | |
auto merge of #15556 : alexcrichton/rust/snapshots, r=brson
Closes #15544
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 586f513835b..14782cafce3 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -94,7 +94,6 @@ //! all the standard macros, such as `assert!`, `fail!`, `println!`, //! and `format!`, also available to all Rust code. -#![crate_id = "std#0.11.0"] // NOTE: remove after stage0 snap #![crate_name = "std"] #![unstable] #![comment = "The Rust standard library"] @@ -108,7 +107,6 @@ #![feature(macro_rules, globs, managed_boxes, linkage)] #![feature(default_type_params, phase, lang_items, unsafe_destructor)] -#![allow(unused_attribute)] // NOTE: remove after stage0 // Don't link to std. We are std. #![no_std] diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 83ea33a1e69..21f80777293 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -45,7 +45,7 @@ #[doc(no_inline)] pub use ops::{BitAnd, BitOr, BitXor}; #[doc(no_inline)] pub use ops::{Drop, Deref, DerefMut}; #[doc(no_inline)] pub use ops::{Shl, Shr}; -#[doc(no_inline)] #[cfg(not(stage0))] pub use ops::{Index, IndexMut}; +#[doc(no_inline)] pub use ops::{Index, IndexMut}; #[doc(no_inline)] pub use option::{Option, Some, None}; #[doc(no_inline)] pub use result::{Result, Ok, Err}; |