diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mem.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/path/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 2 | ||||
| -rw-r--r-- | src/libstd/prelude/v1.rs | 5 |
5 files changed, 8 insertions, 4 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 9e6af86925b..9a6ad04fdbc 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -13,7 +13,7 @@ //! Readers and Writers for in-memory buffers use cmp::min; -use prelude::v1::Index; +use ops::Index; use option::Option::None; use result::Result::{Err, Ok}; use io; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e3c5fcf7552..32b28c0c2c9 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -108,6 +108,7 @@ #![feature(phase, lang_items, unsafe_destructor)] #![feature(slicing_syntax, unboxed_closures)] #![feature(old_impl_check)] +#![cfg_attr(stage0, allow(unused_attributes))] // Don't link to std. We are std. #![no_std] diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index cc418cb510b..581969e98fb 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -68,7 +68,7 @@ use fmt; use iter::IteratorExt; use option::Option; use option::Option::{None, Some}; -use prelude::v1::{FullRange, Index}; +use ops::{FullRange, Index}; use str; use str::StrExt; use string::{String, CowString}; diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index bd3382b4288..bd4b0407bf5 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -25,7 +25,7 @@ use iter::{AdditiveIterator, Extend}; use iter::{Iterator, IteratorExt, Map, repeat}; use mem; use option::Option::{self, Some, None}; -use prelude::v1::{FullRange, Index}; +use ops::{FullRange, Index}; use slice::{SliceExt, SliceConcatExt}; use str::{SplitTerminator, FromStr, StrExt}; use string::{String, ToString}; diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 06a9303e0d7..dcb342b9ca2 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -14,7 +14,10 @@ // Reexported core operators #[stable] #[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync}; -#[stable] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange}; +#[stable] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce}; + +// TEMPORARY +#[unstable] #[doc(no_inline)] pub use ops::{Index, IndexMut, FullRange}; // Reexported functions #[stable] #[doc(no_inline)] pub use mem::drop; |
