Remove FullRange from the prelude etc.

diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
index ba1be09934fdde858abb4015aa0cc25c074bb3a5..56d969b89466cdb21cf13a82fa0e65d57e10bdb1 100644 (file)
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -98,7 +98,10 @@
 use core::marker::Sized;
 use core::mem::size_of;
 use core::mem;
+#[cfg(stage0)]
 use core::ops::{FnMut, FullRange};
+#[cfg(not(stage0))]
+use core::ops::FnMut;
 use core::option::Option::{self, Some, None};
 use core::ptr::PtrExt;
 use core::ptr;
@@ -1509,7 +1512,10 @@ mod tests {
     use core::prelude::{Some, None, range, Clone};
     use core::prelude::{Iterator, IteratorExt};
     use core::prelude::{AsSlice};
+    #[cfg(stage0)]
     use core::prelude::{Ord, FullRange};
+    #[cfg(not(stage0))]
+    use core::prelude::Ord;
     use core::default::Default;
     use core::mem;
     use std::iter::RandomAccessIterator;

diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
index 8f7920fe1c44bcd2207400678d7c44c5371499cc..f13e03c5c36229c273fedb41552349c090c1a329 100644 (file)
--- a/src/libcollections/string.rs
+++ b/src/libcollections/string.rs
@@ -995,6 +995,7 @@ mod tests {
     use str::Utf8Error;
     use core::iter::repeat;
     use super::{as_string, CowString};
+    #[cfg(stage0)]
     use core::ops::FullRange;
 
     #[test]

diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index 336a3d7521a195eea6e3fd4a8bf6854bf8949206..ab64bc88550ff30d20e72bbd4ee2c470f31d058f 100644 (file)
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -1896,6 +1896,7 @@ mod tests {
     use prelude::*;
     use core::mem::size_of;
     use core::iter::repeat;
+    #[cfg(stage0)]
     use core::ops::FullRange;
     use test::Bencher;
     use super::as_vec;

diff --git a/src/libcore/array.rs b/src/libcore/array.rs
index 44541c34ee278fb6637a586502994b4ac716424d..a81615944fb46056c126c0e7f9c7017eb3b1011a 100644 (file)
--- a/src/libcore/array.rs
+++ b/src/libcore/array.rs
@@ -19,7 +19,10 @@
 use fmt;
 use hash::{Hash, Hasher, self};
 use marker::Copy;
+#[cfg(stage0)]
 use ops::{Deref, FullRange};
+#[cfg(not(stage0))]
+use ops::Deref;
 use option::Option;
 
 // macro for implementing n-ary tuple functions and operations

diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
index da3f180d7e127d02d20f16af611572997efc77cb..9d25317866493c65173c342d1a0b74a6f392ec7e 100644 (file)
--- a/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@ -26,7 +26,10 @@
 
 // Reexported core operators
 pub use marker::{Copy, Send, Sized, Sync};
+#[cfg(stage0)]
 pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange};
+#[cfg(not(stage0))]
+pub use ops::{Drop, Fn, FnMut, FnOnce};
 
 // Reexported functions
 pub use iter::range;