Remove a few more usages of std::str from rustc. Issue #855

3 files changed, 5 insertions, 7 deletions

diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 56d3d19553f..c71e04ae747 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -16,7 +16,6 @@ import std::int;
 import std::str;
 import std::istr;
 import std::uint;
-import std::str::rustrt::sbuf;
 import std::map;
 import std::map::hashmap;
 import std::option;
diff --git a/src/comp/middle/trans_common.rs b/src/comp/middle/trans_common.rs
index fc211b1dfaa..98a47b7a386 100644
--- a/src/comp/middle/trans_common.rs
+++ b/src/comp/middle/trans_common.rs
@@ -9,7 +9,6 @@ import std::vec::to_ptr;
 import std::str;
 import std::istr;
 import std::uint;
-import std::str::rustrt::sbuf;
 import std::map;
 import std::map::hashmap;
 import std::option;
diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs
index 508aa1da700..9c9a0049cf1 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/comp/syntax/codemap.rs
@@ -174,17 +174,17 @@ fn maybe_highlight_lines(sp: &option::t<span>, cm: &codemap,
 
             // indent past |name:## | and the 0-offset column location
             let left = istr::char_len(fm.name) + digits + lo.col + 3u;
-            let s = "";
-            while left > 0u { str::push_char(s, ' '); left -= 1u; }
+            let s = ~"";
+            while left > 0u { istr::push_char(s, ' '); left -= 1u; }
 
-            s += "^";
+            s += ~"^";
             let hi = lookup_char_pos(cm, option::get(sp).hi);
             if hi.col != lo.col {
                 // the ^ already takes up one space
                 let width = hi.col - lo.col - 1u;
-                while width > 0u { str::push_char(s, '~'); width -= 1u; }
+                while width > 0u { istr::push_char(s, '~'); width -= 1u; }
             }
-            io::stdout().write_str(istr::from_estr(s + "\n"));
+            io::stdout().write_str(s + ~"\n");
         }
       }
       _ { }