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

3 files changed, 7 insertions, 7 deletions

diff --git a/src/libunicode/normalize.rs b/src/libunicode/normalize.rs
index 29a8b1204b8..d239cb82896 100644
--- a/src/libunicode/normalize.rs
+++ b/src/libunicode/normalize.rs
@@ -14,7 +14,7 @@ use core::cmp::Ordering::{Equal, Less, Greater};
 use core::option::Option;
 use core::option::Option::{Some, None};
 use core::slice;
-use core::slice::SlicePrelude;
+use core::slice::SliceExt;
 use tables::normalization::{canonical_table, compatibility_table, composition_table};
 
 fn bsearch_table<T>(c: char, r: &'static [(char, &'static [T])]) -> Option<&'static [T]> {
diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs
index 7c78c777dda..a219aefad19 100644
--- a/src/libunicode/tables.rs
+++ b/src/libunicode/tables.rs
@@ -18,7 +18,7 @@ pub const UNICODE_VERSION: (uint, uint, uint) = (7, 0, 0);
 
 fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool {
     use core::cmp::Ordering::{Equal, Less, Greater};
-    use core::slice::SlicePrelude;
+    use core::slice::SliceExt;
     r.binary_search(|&(lo,hi)| {
         if lo <= c && c <= hi { Equal }
         else if hi < c { Less }
@@ -6825,7 +6825,7 @@ pub mod normalization {
 
     fn bsearch_range_value_table(c: char, r: &'static [(char, char, u8)]) -> u8 {
         use core::cmp::Ordering::{Equal, Less, Greater};
-        use core::slice::SlicePrelude;
+        use core::slice::SliceExt;
         use core::slice;
         match r.binary_search(|&(lo, hi, _)| {
             if lo <= c && c <= hi { Equal }
@@ -6958,7 +6958,7 @@ pub mod normalization {
 
 pub mod conversions {
     use core::cmp::Ordering::{Equal, Less, Greater};
-    use core::slice::SlicePrelude;
+    use core::slice::SliceExt;
     use core::option::Option;
     use core::option::Option::{Some, None};
     use core::slice;
@@ -7595,7 +7595,7 @@ pub mod conversions {
 pub mod charwidth {
     use core::option::Option;
     use core::option::Option::{Some, None};
-    use core::slice::SlicePrelude;
+    use core::slice::SliceExt;
     use core::slice;
 
     fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 {
@@ -7801,8 +7801,8 @@ pub mod charwidth {
 }
 
 pub mod grapheme {
-    use core::slice::SlicePrelude;
     use core::kinds::Copy;
+    use core::slice::SliceExt;
     pub use self::GraphemeCat::*;
     use core::slice;
 
diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs
index 80311137b01..5e98109c432 100644
--- a/src/libunicode/u_str.rs
+++ b/src/libunicode/u_str.rs
@@ -17,7 +17,7 @@
 
 use self::GraphemeState::*;
 use core::cmp;
-use core::slice::SlicePrelude;
+use core::slice::SliceExt;
 use core::iter::{Filter, AdditiveIterator, Iterator, IteratorExt};
 use core::iter::{DoubleEndedIterator, DoubleEndedIteratorExt};
 use core::kinds::Sized;