impl<T> [T]

20 files changed, 51 insertions, 0 deletions

diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 47069a81d85..48526f2bf2d 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -22,7 +22,10 @@ use old_io;
 use ops::Deref;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
+#[cfg(stage0)]
 use slice::{self, SliceExt};
+#[cfg(not(stage0))]
+use slice;
 #[cfg(stage0)]
 use str::StrExt;
 use string::String;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index ce3b690098f..c89edf72842 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -23,7 +23,10 @@ use option::Option::{self, Some, None};
 use ptr::PtrExt;
 use result::Result::{Ok, Err};
 use result;
+#[cfg(stage0)]
 use slice::{self, SliceExt};
+#[cfg(not(stage0))]
+use slice;
 use string::String;
 #[cfg(stage0)]
 use str::{self, StrExt};
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index 968ffcf6225..ea1e05df85f 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -23,6 +23,7 @@ use char;
 use num::{self, Int, Float, ToPrimitive};
 use num::FpCategory as Fp;
 use ops::FnMut;
+#[cfg(stage0)]
 use slice::SliceExt;
 #[cfg(stage0)]
 use str::StrExt;
diff --git a/src/libstd/old_io/buffered.rs b/src/libstd/old_io/buffered.rs
index 3ee73f5ff60..2f4e1e87099 100644
--- a/src/libstd/old_io/buffered.rs
+++ b/src/libstd/old_io/buffered.rs
@@ -20,6 +20,7 @@ use ops::Drop;
 use option::Option;
 use option::Option::{Some, None};
 use result::Result::Ok;
+#[cfg(stage0)]
 use slice::{SliceExt};
 use slice;
 use vec::Vec;
diff --git a/src/libstd/old_io/comm_adapters.rs b/src/libstd/old_io/comm_adapters.rs
index 72ba653a986..33928d638e0 100644
--- a/src/libstd/old_io/comm_adapters.rs
+++ b/src/libstd/old_io/comm_adapters.rs
@@ -14,7 +14,10 @@ use sync::mpsc::{Sender, Receiver};
 use old_io;
 use option::Option::{None, Some};
 use result::Result::{Ok, Err};
+#[cfg(stage0)]
 use slice::{bytes, SliceExt};
+#[cfg(not(stage0))]
+use slice::bytes;
 use super::{Buffer, Reader, Writer, IoResult};
 use vec::Vec;
 
diff --git a/src/libstd/old_io/extensions.rs b/src/libstd/old_io/extensions.rs
index ec30121d78d..b67ec847c79 100644
--- a/src/libstd/old_io/extensions.rs
+++ b/src/libstd/old_io/extensions.rs
@@ -28,6 +28,7 @@ use option::Option;
 use option::Option::{Some, None};
 use ptr::PtrExt;
 use result::Result::{Ok, Err};
+#[cfg(stage0)]
 use slice::SliceExt;
 
 /// An iterator that reads a single byte on each iteration,
@@ -162,6 +163,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};
+    #[cfg(stage0)]
     use slice::SliceExt;
 
     assert!(size <= 8);
diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs
index b0116bd4efd..a6ed76688ca 100644
--- a/src/libstd/old_io/fs.rs
+++ b/src/libstd/old_io/fs.rs
@@ -64,6 +64,7 @@ use option::Option::{Some, None};
 use old_path::{Path, GenericPath};
 use old_path;
 use result::Result::{Err, Ok};
+#[cfg(stage0)]
 use slice::SliceExt;
 use string::String;
 use vec::Vec;
diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs
index 2445da9ea3b..a31b2e7627d 100644
--- a/src/libstd/old_io/mem.rs
+++ b/src/libstd/old_io/mem.rs
@@ -17,7 +17,10 @@ use option::Option::None;
 use result::Result::{Err, Ok};
 use old_io;
 use old_io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult};
+#[cfg(stage0)]
 use slice::{self, SliceExt};
+#[cfg(not(stage0))]
+use slice;
 use vec::Vec;
 
 const BUF_CAPACITY: uint = 128;
diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs
index 23a7c3d1114..89e813de5b6 100644
--- a/src/libstd/old_io/mod.rs
+++ b/src/libstd/old_io/mod.rs
@@ -268,6 +268,7 @@ use boxed::Box;
 use result::Result;
 use result::Result::{Ok, Err};
 use sys;
+#[cfg(stage0)]
 use slice::SliceExt;
 #[cfg(stage0)]
 use str::StrExt;
diff --git a/src/libstd/old_io/net/ip.rs b/src/libstd/old_io/net/ip.rs
index f71fa9f92ba..2dda2c1277a 100644
--- a/src/libstd/old_io/net/ip.rs
+++ b/src/libstd/old_io/net/ip.rs
@@ -26,6 +26,7 @@ use ops::{FnOnce, FnMut};
 use option::Option;
 use option::Option::{None, Some};
 use result::Result::{self, Ok, Err};
+#[cfg(stage0)]
 use slice::SliceExt;
 #[cfg(stage0)]
 use str::{FromStr, StrExt};
diff --git a/src/libstd/old_io/stdio.rs b/src/libstd/old_io/stdio.rs
index 0e6a4b60e77..92fad231671 100644
--- a/src/libstd/old_io/stdio.rs
+++ b/src/libstd/old_io/stdio.rs
@@ -43,6 +43,7 @@ use ops::{Deref, DerefMut, FnOnce};
 use ptr;
 use result::Result::{Ok, Err};
 use rt;
+#[cfg(stage0)]
 use slice::SliceExt;
 #[cfg(stage0)]
 use str::StrExt;
diff --git a/src/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs
index 3f9cfbd2a07..37875658ae0 100644
--- a/src/libstd/old_path/mod.rs
+++ b/src/libstd/old_path/mod.rs
@@ -75,6 +75,7 @@ use str;
 #[cfg(stage0)]
 use str::StrExt;
 use string::{String, CowString};
+#[cfg(stage0)]
 use slice::SliceExt;
 use vec::Vec;
 
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs
index 790dd87ae91..9ac7512c00b 100644
--- a/src/libstd/old_path/posix.rs
+++ b/src/libstd/old_path/posix.rs
@@ -20,7 +20,10 @@ use iter::{Iterator, IteratorExt, Map};
 use marker::Sized;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
+#[cfg(stage0)]
 use slice::{AsSlice, Split, SliceExt, SliceConcatExt};
+#[cfg(not(stage0))]
+use slice::{AsSlice, Split, SliceConcatExt};
 #[cfg(stage0)]
 use str::{self, FromStr, StrExt};
 #[cfg(not(stage0))]
diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs
index 4e36befefe8..b74bee1242d 100644
--- a/src/libstd/old_path/windows.rs
+++ b/src/libstd/old_path/windows.rs
@@ -27,7 +27,10 @@ use iter::{Iterator, IteratorExt, Map, repeat};
 use mem;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
+#[cfg(stage0)]
 use slice::{SliceExt, SliceConcatExt};
+#[cfg(not(stage0))]
+use slice::SliceConcatExt;
 #[cfg(stage0)]
 use str::{SplitTerminator, FromStr, StrExt};
 #[cfg(not(stage0))]
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 2e869312946..e04d7f3f240 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -56,7 +56,10 @@ use ptr::PtrExt;
 use ptr;
 use result::Result::{Err, Ok};
 use result::Result;
+#[cfg(stage0)]
 use slice::{AsSlice, SliceExt};
+#[cfg(not(stage0))]
+use slice::AsSlice;
 #[cfg(stage0)]
 use str::{Str, StrExt};
 #[cfg(not(stage0))]
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index 81cdced58bd..e21ae1657ee 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -44,8 +44,12 @@
 #[doc(no_inline)] pub use ptr::{PtrExt, MutPtrExt};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use result::Result::{self, Ok, Err};
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use slice::{SliceExt, SliceConcatExt, AsSlice};
+#[cfg(not(stage0))]
+#[stable(feature = "rust1", since = "1.0.0")]
+#[doc(no_inline)] pub use slice::{SliceConcatExt, AsSlice};
 #[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use str::{Str, StrExt};
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index 6cb3eb4d16e..46e35e0fa8b 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -24,6 +24,7 @@ mod imp {
     use rand::Rng;
     use rand::reader::ReaderRng;
     use result::Result::Ok;
+    #[cfg(stage0)]
     use slice::SliceExt;
     use mem;
     use os::errno;
@@ -193,6 +194,7 @@ mod imp {
     use rand::Rng;
     use result::Result::{Ok};
     use self::libc::{c_int, size_t};
+    #[cfg(stage0)]
     use slice::SliceExt;
 
     /// A random number generator that retrieves randomness straight from
@@ -263,6 +265,7 @@ mod imp {
     use result::Result::{Ok, Err};
     use self::libc::{DWORD, BYTE, LPCSTR, BOOL};
     use self::libc::types::os::arch::extra::{LONG_PTR};
+    #[cfg(stage0)]
     use slice::SliceExt;
 
     type HCRYPTPROV = LONG_PTR;
diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs
index 08c43198aa1..eac5aa4256c 100644
--- a/src/libstd/rand/reader.rs
+++ b/src/libstd/rand/reader.rs
@@ -13,6 +13,7 @@
 use old_io::Reader;
 use rand::Rng;
 use result::Result::{Ok, Err};
+#[cfg(stage0)]
 use slice::SliceExt;
 
 /// An RNG that reads random bytes straight from a `Reader`. This will
diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs
index 4c0b26f8649..dfc88571a82 100644
--- a/src/libstd/sys/common/wtf8.rs
+++ b/src/libstd/sys/common/wtf8.rs
@@ -172,6 +172,7 @@ impl Wtf8Buf {
         Wtf8Buf { bytes: string.into_bytes() }
     }
 
+    #[cfg(stage0)]
     /// Create a WTF-8 string from an UTF-8 `&str` slice.
     ///
     /// This copies the content of the slice.
@@ -182,6 +183,17 @@ impl Wtf8Buf {
         Wtf8Buf { bytes: slice::SliceExt::to_vec(str.as_bytes()) }
     }
 
+    #[cfg(not(stage0))]
+    /// Create a WTF-8 string from an UTF-8 `&str` slice.
+    ///
+    /// This copies the content of the slice.
+    ///
+    /// Since WTF-8 is a superset of UTF-8, this always succeeds.
+    #[inline]
+    pub fn from_str(str: &str) -> Wtf8Buf {
+        Wtf8Buf { bytes: <[_]>::to_vec(str.as_bytes()) }
+    }
+
     /// Create a WTF-8 string from a potentially ill-formed UTF-16 slice of 16-bit code units.
     ///
     /// This is lossless: calling `.encode_wide()` on the resulting string
diff --git a/src/libstd/sys/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs
index 89ab3e1981b..99591480752 100644
--- a/src/libstd/sys/unix/os_str.rs
+++ b/src/libstd/sys/unix/os_str.rs
@@ -16,6 +16,7 @@ use core::prelude::*;
 use borrow::Cow;
 use fmt::{self, Debug};
 use vec::Vec;
+#[cfg(stage0)]
 use slice::SliceExt as StdSliceExt;
 use str;
 use string::String;