std: Collapse SlicePrelude traits

This commit collapses the various prelude traits for slices into just one trait:

* SlicePrelude/SliceAllocPrelude => SliceExt
* CloneSlicePrelude/CloneSliceAllocPrelude => CloneSliceExt
* OrdSlicePrelude/OrdSliceAllocPrelude => OrdSliceExt
* PartialEqSlicePrelude => PartialEqSliceExt

21 files changed, 37 insertions, 46 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index ad2167214a7..342f5b87bd8 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -23,7 +23,7 @@ use mem;
 use ops::FnMut;
 use option::Option;
 use option::Option::{Some, None};
-use slice::{SlicePrelude, AsSlice};
+use slice::{SliceExt, AsSlice};
 use str::{Str, StrPrelude};
 use string::{String, IntoString};
 use vec::Vec;
diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs
index 745a8298ee8..c71f0d5b935 100644
--- a/src/libstd/collections/hash/set.rs
+++ b/src/libstd/collections/hash/set.rs
@@ -638,7 +638,7 @@ mod test_set {
     use prelude::*;
 
     use super::HashSet;
-    use slice::PartialEqSlicePrelude;
+    use slice::PartialEqSliceExt;
 
     #[test]
     fn test_disjoint() {
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
index 059ad753719..758dab1a107 100644
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -26,7 +26,7 @@ use os;
 use path::{Path,GenericPath};
 use result::*;
 use result::Result::{Err, Ok};
-use slice::{AsSlice,SlicePrelude};
+use slice::{AsSlice,SliceExt};
 use str;
 use string::String;
 use vec::Vec;
@@ -295,7 +295,7 @@ pub mod dl {
     use ptr;
     use result::Result;
     use result::Result::{Ok, Err};
-    use slice::SlicePrelude;
+    use slice::SliceExt;
     use str::StrPrelude;
     use str;
     use string::String;
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index a8de7356fe7..0a1bf3090ba 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -19,7 +19,7 @@ use ops::Drop;
 use option::Option;
 use option::Option::{Some, None};
 use result::Result::{Ok, Err};
-use slice::{SlicePrelude};
+use slice::{SliceExt};
 use slice;
 use vec::Vec;
 
diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs
index 308dc094101..2aa7435d871 100644
--- a/src/libstd/io/comm_adapters.rs
+++ b/src/libstd/io/comm_adapters.rs
@@ -14,7 +14,7 @@ use comm::{Sender, Receiver};
 use io;
 use option::Option::{None, Some};
 use result::Result::{Ok, Err};
-use slice::{bytes, CloneSliceAllocPrelude, SlicePrelude};
+use slice::{bytes, CloneSliceExt, SliceExt};
 use super::{Buffer, Reader, Writer, IoResult};
 use vec::Vec;
 
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs
index 69712e39d91..24a000adef2 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -24,7 +24,7 @@ use option::Option;
 use option::Option::{Some, None};
 use ptr::RawPtr;
 use result::Result::{Ok, Err};
-use slice::{SlicePrelude, AsSlice};
+use slice::{SliceExt, AsSlice};
 
 /// An iterator that reads a single byte on each iteration,
 /// until `.read_byte()` returns `EndOfFile`.
@@ -156,7 +156,7 @@ pub fn u64_to_be_bytes<T, F>(n: u64, size: uint, f: F) -> T where
 ///           32-bit value is parsed.
 pub fn u64_from_be_bytes(data: &[u8], start: uint, size: uint) -> u64 {
     use ptr::{copy_nonoverlapping_memory};
-    use slice::SlicePrelude;
+    use slice::SliceExt;
 
     assert!(size <= 8u);
 
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index da0834dc9ef..40c28877548 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -64,7 +64,7 @@ use option::Option::{Some, None};
 use path::{Path, GenericPath};
 use path;
 use result::Result::{Err, Ok};
-use slice::SlicePrelude;
+use slice::SliceExt;
 use string::String;
 use vec::Vec;
 
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 4dc87278e2b..03d2af1b426 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -19,7 +19,7 @@ use option::Option::None;
 use result::Result::{Err, Ok};
 use io;
 use io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult};
-use slice::{mod, AsSlice, SlicePrelude};
+use slice::{mod, AsSlice, SliceExt};
 use vec::Vec;
 
 const BUF_CAPACITY: uint = 128;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 4baeaabc6c6..9706da73976 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -241,7 +241,7 @@ use boxed::Box;
 use result::Result;
 use result::Result::{Ok, Err};
 use sys;
-use slice::SlicePrelude;
+use slice::SliceExt;
 use str::StrPrelude;
 use str;
 use string::String;
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index 62965c48a26..092410fbc8e 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -27,7 +27,7 @@ use option::Option;
 use option::Option::{None, Some};
 use result::Result::{Ok, Err};
 use str::{FromStr, StrPrelude};
-use slice::{CloneSlicePrelude, SlicePrelude};
+use slice::{CloneSliceExt, SliceExt};
 use vec::Vec;
 
 pub type Port = u16;
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index 344012a09a0..950946da126 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -44,7 +44,7 @@ use result::Result::{Ok, Err};
 use rustrt;
 use rustrt::local::Local;
 use rustrt::task::Task;
-use slice::SlicePrelude;
+use slice::SliceExt;
 use str::StrPrelude;
 use string::String;
 use sys::{fs, tty};
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 900c223c70b..9cc165ce570 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -337,7 +337,7 @@ macro_rules! try (
 #[macro_export]
 macro_rules! vec[
     ($($x:expr),*) => ({
-        use std::slice::BoxedSlicePrelude;
+        use std::slice::BoxedSliceExt;
         let xs: ::std::boxed::Box<[_]> = box [$($x),*];
         xs.into_vec()
     });
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index d5c27c7fbf8..2b319640d1b 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -16,13 +16,11 @@ pub use self::ExponentFormat::*;
 pub use self::SignificantDigits::*;
 pub use self::SignFormat::*;
 
-use char;
-use char::Char;
+use char::{mod, Char};
 use kinds::Copy;
-use num;
-use num::{Int, Float, FPNaN, FPInfinite, ToPrimitive};
+use num::{mod, Int, Float, FPNaN, FPInfinite, ToPrimitive};
 use ops::FnMut;
-use slice::{SlicePrelude, CloneSliceAllocPrelude};
+use slice::{SliceExt, CloneSliceExt};
 use str::StrPrelude;
 use string::String;
 use vec::Vec;
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index a3ecfb49ace..bf28b67f430 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -51,8 +51,8 @@ use ptr::RawPtr;
 use ptr;
 use result::Result;
 use result::Result::{Err, Ok};
-use slice::{AsSlice, SlicePrelude, PartialEqSlicePrelude};
-use slice::CloneSliceAllocPrelude;
+use slice::{AsSlice, SliceExt, PartialEqSliceExt};
+use slice::CloneSliceExt;
 use str::{Str, StrPrelude, StrAllocating};
 use string::{String, ToString};
 use sync::atomic::{AtomicInt, INIT_ATOMIC_INT, SeqCst};
@@ -168,7 +168,7 @@ pub mod windoze {
     use option::Option::None;
     use option;
     use os::TMPBUF_SZ;
-    use slice::{SlicePrelude};
+    use slice::SliceExt;
     use string::String;
     use str::StrPrelude;
     use vec::Vec;
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs
index c7feff8705e..8f98329a4be 100644
--- a/src/libstd/path/mod.rs
+++ b/src/libstd/path/mod.rs
@@ -71,8 +71,8 @@ use option::Option::{None, Some};
 use str;
 use str::{CowString, MaybeOwned, Str, StrPrelude};
 use string::String;
-use slice::{AsSlice, CloneSliceAllocPrelude};
-use slice::{PartialEqSlicePrelude, SlicePrelude};
+use slice::{AsSlice, CloneSliceExt};
+use slice::{PartialEqSliceExt, SliceExt};
 use vec::Vec;
 
 /// Typedef for POSIX file paths.
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index 4041a6f60d7..bea51712253 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -22,8 +22,8 @@ use option::Option::{None, Some};
 use kinds::Sized;
 use str::{FromStr, Str};
 use str;
-use slice::{CloneSliceAllocPrelude, Splits, AsSlice, VectorVector,
-            PartialEqSlicePrelude, SlicePrelude};
+use slice::{CloneSliceExt, Splits, AsSlice, VectorVector,
+            PartialEqSliceExt, SliceExt};
 use vec::Vec;
 
 use super::{BytesContainer, GenericPath, GenericPathUnsafe};
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 3983e365ae1..8b18d1d8cd4 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -26,7 +26,7 @@ use kinds::Copy;
 use mem;
 use option::Option;
 use option::Option::{Some, None};
-use slice::{AsSlice, SlicePrelude};
+use slice::{AsSlice, SliceExt};
 use str::{CharSplits, FromStr, Str, StrAllocating, StrVector, StrPrelude};
 use string::String;
 use unicode::char::UnicodeChar;
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index ec1cff73e96..8b6575b6bc1 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -84,10 +84,10 @@
 #[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
 #[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
 #[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};
-#[doc(no_inline)] pub use slice::{SlicePrelude, AsSlice, CloneSlicePrelude};
-#[doc(no_inline)] pub use slice::{VectorVector, PartialEqSlicePrelude, OrdSlicePrelude};
-#[doc(no_inline)] pub use slice::{CloneSliceAllocPrelude, OrdSliceAllocPrelude, SliceAllocPrelude};
-#[doc(no_inline)] pub use slice::{BoxedSlicePrelude};
+#[doc(no_inline)] pub use slice::AsSlice;
+#[doc(no_inline)] pub use slice::{VectorVector, PartialEqSliceExt};
+#[doc(no_inline)] pub use slice::{CloneSliceExt, OrdSliceExt, SliceExt};
+#[doc(no_inline)] pub use slice::{BoxedSliceExt};
 #[doc(no_inline)] pub use string::{IntoString, String, ToString};
 #[doc(no_inline)] pub use vec::Vec;
 
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index 5405892535c..bbe8edc0f00 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -24,7 +24,7 @@ mod imp {
     use rand::Rng;
     use rand::reader::ReaderRng;
     use result::Result::{Ok, Err};
-    use slice::SlicePrelude;
+    use slice::SliceExt;
     use mem;
     use os::errno;
 
@@ -175,7 +175,7 @@ mod imp {
     use rand::Rng;
     use result::Result::{Ok};
     use self::libc::{c_int, size_t};
-    use slice::{SlicePrelude};
+    use slice::SliceExt;
 
     /// A random number generator that retrieves randomness straight from
     /// the operating system. Platform sources:
@@ -243,7 +243,7 @@ mod imp {
     use result::Result::{Ok, Err};
     use self::libc::{DWORD, BYTE, LPCSTR, BOOL};
     use self::libc::types::os::arch::extra::{LONG_PTR};
-    use slice::{SlicePrelude};
+    use slice::SliceExt;
 
     type HCRYPTPROV = LONG_PTR;
 
diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs
index ca6322247c2..7298b2ef0ac 100644
--- a/src/libstd/rand/reader.rs
+++ b/src/libstd/rand/reader.rs
@@ -13,7 +13,7 @@
 use io::Reader;
 use rand::Rng;
 use result::Result::{Ok, Err};
-use slice::SlicePrelude;
+use slice::SliceExt;
 
 /// An RNG that reads random bytes straight from a `Reader`. This will
 /// work best with an infinite reader, but this is not required.
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index 4ac09a071bb..ad4695eb7fe 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -232,13 +232,12 @@ fn demangle(writer: &mut Writer, s: &str) -> IoResult<()> {
 /// all unix platforms we support right now, so it at least gets the job done.
 #[cfg(unix)]
 mod imp {
+    use prelude::*;
+
     use c_str::CString;
-    use io::{IoResult, Writer};
+    use io::IoResult;
     use libc;
     use mem;
-    use option::Option;
-    use option::Option::{Some, None};
-    use result::Result::{Ok, Err};
     use sync::{StaticMutex, MUTEX_INIT};
 
     /// As always - iOS on arm uses SjLj exceptions and
@@ -253,9 +252,7 @@ mod imp {
     #[cfg(all(target_os = "ios", target_arch = "arm"))]
     #[inline(never)]
     pub fn write(w: &mut Writer) -> IoResult<()> {
-        use iter::{IteratorExt, range};
         use result;
-        use slice::{SlicePrelude};
 
         extern {
             fn backtrace(buf: *mut *mut libc::c_void,
@@ -389,12 +386,8 @@ mod imp {
 
     #[cfg(not(any(target_os = "macos", target_os = "ios")))]
     fn print(w: &mut Writer, idx: int, addr: *mut libc::c_void) -> IoResult<()> {
-        use iter::IteratorExt;
         use os;
-        use path::GenericPath;
-        use ptr::RawPtr;
         use ptr;
-        use slice::{SlicePrelude};
 
         ////////////////////////////////////////////////////////////////////////
         // libbacktrace.h API
@@ -669,7 +662,7 @@ mod imp {
     use path::Path;
     use result::Result::{Ok, Err};
     use sync::{StaticMutex, MUTEX_INIT};
-    use slice::SlicePrelude;
+    use slice::SliceExt;
     use str::StrPrelude;
     use dynamic_lib::DynamicLibrary;