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/libcore | |
| 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/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 2 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 2 | ||||
| -rw-r--r-- | src/libcore/prelude.rs | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index d27cf760690..6d76f7c36e8 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -47,7 +47,6 @@ // Since libcore defines many fundamental lang items, all tests live in a // separate crate, libcoretest, to avoid bizarre issues. -#![crate_id = "core#0.11.0"] #![crate_name = "core"] #![experimental] #![license = "MIT/ASL2"] @@ -61,7 +60,6 @@ #![feature(globs, intrinsics, lang_items, macro_rules, managed_boxes, phase)] #![feature(simd, unsafe_destructor)] #![deny(missing_doc)] -#![allow(unused_attribute)] // NOTE: remove after stage0 mod macros; diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index fc37fdde8f5..53179df4cb9 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -636,7 +636,6 @@ shr_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="index"] -#[cfg(not(stage0))] pub trait Index<Index,Result> { /// The method for the indexing (`Foo[Bar]`) operation fn index<'a>(&'a self, index: &Index) -> &'a Result; @@ -668,7 +667,6 @@ pub trait Index<Index,Result> { * ``` */ #[lang="index_mut"] -#[cfg(not(stage0))] pub trait IndexMut<Index,Result> { /// The method for the indexing (`Foo[Bar]`) operation fn index_mut<'a>(&'a mut self, index: &Index) -> &'a mut Result; diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index f967a2a5fa5..d8ab89fd504 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -34,7 +34,6 @@ pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not}; pub use ops::{BitAnd, BitOr, BitXor}; pub use ops::{Drop, Deref, DerefMut}; pub use ops::{Shl, Shr}; -#[cfg(not(stage0))] pub use ops::{Index, IndexMut}; pub use option::{Option, Some, None}; pub use result::{Result, Ok, Err}; |