5 files changed, 7 insertions, 1 deletions
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;