---

yaml
---
r: 5073
b: refs/heads/master
c: 1772ee3
h: refs/heads/master
i:
  5071: 93a88ab
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc6f78561c238c472a6bab50eea36f4b3a39671d
+refs/heads/master: 1772ee3c43656729f096d8902d7cf6f4d9cacc8d

trunk/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;

trunk/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;

trunk/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");
         }
       }
       _ { }