impl str

14 files changed, 28 insertions, 3 deletions

diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 677894ba6e4..47069a81d85 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -23,6 +23,7 @@ use ops::Deref;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
 use slice::{self, SliceExt};
+#[cfg(stage0)]
 use str::StrExt;
 use string::String;
 use vec::Vec;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 35ef375174a..ce3b690098f 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -25,7 +25,10 @@ use result::Result::{Ok, Err};
 use result;
 use slice::{self, SliceExt};
 use string::String;
+#[cfg(stage0)]
 use str::{self, StrExt};
+#[cfg(not(stage0))]
+use str;
 use vec::Vec;
 
 pub use self::buffered::{BufReader, BufWriter, BufStream, LineWriter};
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index fa24e9fd5af..968ffcf6225 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -24,6 +24,7 @@ use num::{self, Int, Float, ToPrimitive};
 use num::FpCategory as Fp;
 use ops::FnMut;
 use slice::SliceExt;
+#[cfg(stage0)]
 use str::StrExt;
 use string::String;
 use vec::Vec;
diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs
index 711faa98bd9..23a7c3d1114 100644
--- a/src/libstd/old_io/mod.rs
+++ b/src/libstd/old_io/mod.rs
@@ -269,6 +269,7 @@ use result::Result;
 use result::Result::{Ok, Err};
 use sys;
 use slice::SliceExt;
+#[cfg(stage0)]
 use str::StrExt;
 use str;
 use string::String;
diff --git a/src/libstd/old_io/net/ip.rs b/src/libstd/old_io/net/ip.rs
index 6e2f491262d..f71fa9f92ba 100644
--- a/src/libstd/old_io/net/ip.rs
+++ b/src/libstd/old_io/net/ip.rs
@@ -27,7 +27,10 @@ use option::Option;
 use option::Option::{None, Some};
 use result::Result::{self, Ok, Err};
 use slice::SliceExt;
+#[cfg(stage0)]
 use str::{FromStr, StrExt};
+#[cfg(not(stage0))]
+use str::FromStr;
 use vec::Vec;
 
 pub type Port = u16;
diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs
index cabba8e358a..647ef730617 100644
--- a/src/libstd/old_io/process.rs
+++ b/src/libstd/old_io/process.rs
@@ -761,7 +761,7 @@ mod tests {
     use old_io::{Truncate, Write, TimedOut, timer, process, FileNotFound};
     use prelude::v1::{Ok, Err, range, drop, Some, None, Vec};
     use prelude::v1::{Path, String, Reader, Writer, Clone};
-    use prelude::v1::{SliceExt, Str, StrExt, AsSlice, ToString, GenericPath};
+    use prelude::v1::{SliceExt, Str, AsSlice, ToString, GenericPath};
     use old_io::fs::PathExtensions;
     use old_io::timer::*;
     use rt::running_on_valgrind;
diff --git a/src/libstd/old_io/stdio.rs b/src/libstd/old_io/stdio.rs
index dcc34505730..0e6a4b60e77 100644
--- a/src/libstd/old_io/stdio.rs
+++ b/src/libstd/old_io/stdio.rs
@@ -44,6 +44,7 @@ use ptr;
 use result::Result::{Ok, Err};
 use rt;
 use slice::SliceExt;
+#[cfg(stage0)]
 use str::StrExt;
 use string::String;
 use sys::{fs, tty};
diff --git a/src/libstd/old_io/tempfile.rs b/src/libstd/old_io/tempfile.rs
index 76753dca52e..b34804fce61 100644
--- a/src/libstd/old_io/tempfile.rs
+++ b/src/libstd/old_io/tempfile.rs
@@ -21,6 +21,7 @@ use option::Option;
 use old_path::{Path, GenericPath};
 use rand::{Rng, thread_rng};
 use result::Result::{Ok, Err};
+#[cfg(stage0)]
 use str::StrExt;
 use string::String;
 
diff --git a/src/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs
index 01eec230d21..3f9cfbd2a07 100644
--- a/src/libstd/old_path/mod.rs
+++ b/src/libstd/old_path/mod.rs
@@ -72,6 +72,7 @@ use iter::IteratorExt;
 use option::Option;
 use option::Option::{None, Some};
 use str;
+#[cfg(stage0)]
 use str::StrExt;
 use string::{String, CowString};
 use slice::SliceExt;
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs
index 8d5765e1ffe..790dd87ae91 100644
--- a/src/libstd/old_path/posix.rs
+++ b/src/libstd/old_path/posix.rs
@@ -21,7 +21,10 @@ use marker::Sized;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
 use slice::{AsSlice, Split, SliceExt, SliceConcatExt};
+#[cfg(stage0)]
 use str::{self, FromStr, StrExt};
+#[cfg(not(stage0))]
+use str::{self, FromStr};
 use vec::Vec;
 
 use super::{BytesContainer, GenericPath, GenericPathUnsafe};
@@ -448,7 +451,7 @@ mod tests {
     use option::Option::{self, Some, None};
     use old_path::GenericPath;
     use slice::{AsSlice, SliceExt};
-    use str::{self, Str, StrExt};
+    use str::{self, Str};
     use string::ToString;
     use vec::Vec;
 
diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs
index 1387d531001..4e36befefe8 100644
--- a/src/libstd/old_path/windows.rs
+++ b/src/libstd/old_path/windows.rs
@@ -28,7 +28,10 @@ use mem;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
 use slice::{SliceExt, SliceConcatExt};
+#[cfg(stage0)]
 use str::{SplitTerminator, FromStr, StrExt};
+#[cfg(not(stage0))]
+use str::{SplitTerminator, FromStr};
 use string::{String, ToString};
 use vec::Vec;
 
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 2dea77a3ccd..2e869312946 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -57,7 +57,10 @@ use ptr;
 use result::Result::{Err, Ok};
 use result::Result;
 use slice::{AsSlice, SliceExt};
+#[cfg(stage0)]
 use str::{Str, StrExt};
+#[cfg(not(stage0))]
+use str::Str;
 use str;
 use string::{String, ToString};
 use sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering};
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index b244f785852..81cdced58bd 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -46,8 +46,12 @@
 #[doc(no_inline)] pub use result::Result::{self, Ok, Err};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use slice::{SliceExt, SliceConcatExt, AsSlice};
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use str::{Str, StrExt};
+#[cfg(not(stage0))]
+#[stable(feature = "rust1", since = "1.0.0")]
+#[doc(no_inline)] pub use str::Str;
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use string::{String, ToString};
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 08aa92d5f20..db613db74cf 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -533,7 +533,7 @@ mod tests {
     use io::prelude::*;
     use prelude::v1::{Ok, Err, drop, Some, Vec};
     use prelude::v1::{String, Clone};
-    use prelude::v1::{SliceExt, Str, StrExt, AsSlice, ToString, GenericPath};
+    use prelude::v1::{SliceExt, Str, AsSlice, ToString, GenericPath};
     use old_path;
     use old_io::fs::PathExtensions;
     use rt::running_on_valgrind;