Fix errors

5 files changed, 11 insertions, 18 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 23a7d45e928..b9c86e2b235 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -19,7 +19,6 @@ use mem;
 use option::{Option, Some, None};
 use slice::{ImmutableVector, MutableVector, Vector};
 use str::{OwnedStr, Str, StrAllocating, StrSlice};
-use str;
 use string::String;
 use to_str::{IntoStr};
 use vec::Vec;
@@ -676,8 +675,8 @@ mod tests {
         while i <= 500 {
             let upper = if 'a' as u32 <= i && i <= 'z' as u32 { i + 'A' as u32 - 'a' as u32 }
                         else { i };
-            assert_eq!((from_u32(i).unwrap()).to_str().as_slice().to_ascii_upper(),
-                       (from_u32(upper).unwrap()).to_str())
+            assert_eq!((from_u32(i).unwrap()).to_string().as_slice().to_ascii_upper(),
+                       (from_u32(upper).unwrap()).to_string())
             i += 1;
         }
     }
@@ -692,8 +691,8 @@ mod tests {
         while i <= 500 {
             let lower = if 'A' as u32 <= i && i <= 'Z' as u32 { i + 'a' as u32 - 'A' as u32 }
                         else { i };
-            assert_eq!((from_u32(i).unwrap()).to_str().as_slice().to_ascii_lower(),
-                       (from_u32(lower).unwrap()).to_str())
+            assert_eq!((from_u32(i).unwrap()).to_string().as_slice().to_ascii_lower(),
+                       (from_u32(lower).unwrap()).to_string())
             i += 1;
         }
     }
@@ -708,8 +707,8 @@ mod tests {
         while i <= 500 {
             let upper = if 'a' as u32 <= i && i <= 'z' as u32 { i + 'A' as u32 - 'a' as u32 }
                         else { i };
-            assert_eq!((from_u32(i).unwrap()).to_str().into_ascii_upper(),
-                       (from_u32(upper).unwrap()).to_str())
+            assert_eq!((from_u32(i).unwrap()).to_string().into_ascii_upper(),
+                       (from_u32(upper).unwrap()).to_string())
             i += 1;
         }
     }
@@ -725,8 +724,8 @@ mod tests {
         while i <= 500 {
             let lower = if 'A' as u32 <= i && i <= 'Z' as u32 { i + 'a' as u32 - 'A' as u32 }
                         else { i };
-            assert_eq!((from_u32(i).unwrap()).to_str().into_ascii_lower(),
-                       (from_u32(lower).unwrap()).to_str())
+            assert_eq!((from_u32(i).unwrap()).to_string().into_ascii_lower(),
+                       (from_u32(lower).unwrap()).to_string())
             i += 1;
         }
     }
@@ -746,8 +745,8 @@ mod tests {
             let c = i;
             let lower = if 'A' as u32 <= c && c <= 'Z' as u32 { c + 'a' as u32 - 'A' as u32 }
                         else { c };
-            assert!((from_u32(i).unwrap()).to_str().as_slice().eq_ignore_ascii_case(
-                    (from_u32(lower).unwrap()).to_str().as_slice()));
+            assert!((from_u32(i).unwrap()).to_string().as_slice().eq_ignore_ascii_case(
+                    (from_u32(lower).unwrap()).to_string().as_slice()));
             i += 1;
         }
     }
diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs
index aacf1232df5..b9c6220c0e2 100644
--- a/src/libstd/fmt.rs
+++ b/src/libstd/fmt.rs
@@ -417,10 +417,7 @@ the `}` character is escaped with `}}`.
 use io::Writer;
 use io;
 use result::{Ok, Err};
-use str::{Str, StrAllocating};
-use str;
 use string;
-use slice::Vector;
 
 pub use core::fmt::{Formatter, Result, FormatWriter, rt};
 pub use core::fmt::{Show, Bool, Char, Signed, Unsigned, Octal, Binary};
@@ -464,7 +461,7 @@ pub use core::fmt::{secret_pointer};
 pub fn format(args: &Arguments) -> string::String{
     let mut output = io::MemWriter::new();
     let _ = write!(&mut output, "{}", args);
-    String::from_utf8(output.unwrap()).unwrap()
+    string::String::from_utf8(output.unwrap()).unwrap()
 }
 
 impl<'a> Writer for Formatter<'a> {
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index 1f18200f5aa..1eee6983494 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -14,7 +14,6 @@
 
 use prelude::*;
 
-use str;
 use fmt;
 use os;
 use io::{IoResult, IoError};
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 11b787f0b9a..96d3b3e3e6a 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -151,7 +151,6 @@ pub mod win32 {
     use slice::{MutableVector, ImmutableVector};
     use string::String;
     use str::StrSlice;
-    use str;
     use vec::Vec;
 
     pub fn fill_utf16_buf_and_decode(f: |*mut u16, DWORD| -> DWORD)
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index fa9bf5d9bb6..d01a1b5b131 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -992,7 +992,6 @@ mod imp {
 mod test {
     use prelude::*;
     use io::MemWriter;
-    use str;
 
     macro_rules! t( ($a:expr, $b:expr) => ({
         let mut m = MemWriter::new();