std: Collapse SlicePrelude traits

src/etc/unicode.py

@@ -289,7 +289,7 @@ def emit_bsearch_range_table(f):
     f.write("""
 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 }
@@ -347,7 +347,7 @@ def emit_conversions_module(f, lowerupper, upperlower):
     f.write("pub mod conversions {")
     f.write("""
     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;
@@ -386,8 +386,8 @@ def emit_conversions_module(f, lowerupper, upperlower):
 
 def emit_grapheme_module(f, grapheme_table, grapheme_cats):
     f.write("""pub mod grapheme {
-    use core::slice::SlicePrelude;
     use core::kinds::Copy;
+    use core::slice::SliceExt;
     pub use self::GraphemeCat::*;
     use core::slice;
 
@@ -431,7 +431,7 @@ def emit_charwidth_module(f, width_table):
     f.write("pub mod charwidth {\n")
     f.write("    use core::option::Option;\n")
     f.write("    use core::option::Option::{Some, None};\n")
-    f.write("    use core::slice::SlicePrelude;\n")
+    f.write("    use core::slice::SliceExt;\n")
     f.write("    use core::slice;\n")
     f.write("""
     fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 {
@@ -531,7 +531,7 @@ def comp_pfun(char):
     f.write("""
     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 }

src/libcollections/hash/mod.rs

@@ -297,7 +297,7 @@ mod tests {
     use core::kinds::Sized;
     use std::mem;
 
-    use slice::SlicePrelude;
+    use slice::SliceExt;
     use super::{Hash, Hasher, Writer};
 
     struct MyWriterHasher;

src/libcollections/hash/sip.rs

@@ -276,7 +276,7 @@ mod tests {
 
     use str::Str;
     use string::String;
-    use slice::{AsSlice, SlicePrelude};
+    use slice::{AsSlice, SliceExt};
     use vec::Vec;
 
     use super::super::{Hash, Writer};

src/libcollections/lib.rs

@@ -24,7 +24,7 @@
 #![allow(unknown_features)]
 #![feature(macro_rules, default_type_params, phase, globs)]
 #![feature(unsafe_destructor, import_shadowing, slicing_syntax)]
-#![feature(tuple_indexing, unboxed_closures)]
+#![feature(unboxed_closures)]
 #![no_std]
 
 #[phase(plugin, link)] extern crate core;