libcore: De-mode str

5 files changed, 29 insertions, 26 deletions

diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index cbe9097bd7d..5b72bf61fde 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -255,14 +255,14 @@ fn highlight_lines(cm: codemap::codemap, sp: span,
         // indent past |name:## | and the 0-offset column location
         let mut left = str::len(fm.name) + digits + lo.col + 3u;
         let mut s = ~"";
-        while left > 0u { str::push_char(s, ' '); left -= 1u; }
+        while left > 0u { str::push_char(&mut s, ' '); left -= 1u; }
 
         s += ~"^";
         let hi = codemap::lookup_char_pos(cm, sp.hi);
         if hi.col != lo.col {
             // the ^ already takes up one space
             let mut width = hi.col - lo.col - 1u;
-            while width > 0u { str::push_char(s, '~'); width -= 1u; }
+            while width > 0u { str::push_char(&mut s, '~'); width -= 1u; }
         }
         io::stderr().write_str(s + ~"\n");
     }
diff --git a/src/libsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs
index da37e44b58c..83899b58d66 100644
--- a/src/libsyntax/ext/qquote.rs
+++ b/src/libsyntax/ext/qquote.rs
@@ -236,11 +236,11 @@ fn finish<T: qq_helper>
             str2 += repl;
         }
         match copy state {
-          active => str::push_char(str2, ch),
+          active => str::push_char(&mut str2, ch),
           skip(1u) => state = blank,
           skip(sk) => state = skip (sk-1u),
-          blank if is_space(ch) => str::push_char(str2, ch),
-          blank => str::push_char(str2, ' ')
+          blank if is_space(ch) => str::push_char(&mut str2, ch),
+          blank => str::push_char(&mut str2, ' ')
         }
         i += 1u;
         if (j < g_len && i == cx.gather[j].hi) {
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index 214b9e3fbbd..7f1ec109370 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -117,7 +117,7 @@ fn strip_doc_comment_decoration(comment: ~str) -> ~str {
 fn read_to_eol(rdr: string_reader) -> ~str {
     let mut val = ~"";
     while rdr.curr != '\n' && !is_eof(rdr) {
-        str::push_char(val, rdr.curr);
+        str::push_char(&mut val, rdr.curr);
         bump(rdr);
     }
     if rdr.curr == '\n' { bump(rdr); }
@@ -242,7 +242,7 @@ fn read_block_comment(rdr: string_reader, code_to_the_left: bool,
             curr_line = ~"";
             bump(rdr);
         } else {
-            str::push_char(curr_line, rdr.curr);
+            str::push_char(&mut curr_line, rdr.curr);
             if rdr.curr == '/' && nextch(rdr) == '*' {
                 bump(rdr);
                 bump(rdr);
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 2103af39bae..c32aaa3d474 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -214,7 +214,7 @@ fn consume_any_line_comment(rdr: string_reader)
                 let start_chpos = rdr.chpos - 2u;
                 let mut acc = ~"//";
                 while rdr.curr != '\n' && !is_eof(rdr) {
-                    str::push_char(acc, rdr.curr);
+                    str::push_char(&mut acc, rdr.curr);
                     bump(rdr);
                 }
                 return Some({
@@ -253,7 +253,7 @@ fn consume_block_comment(rdr: string_reader)
         let start_chpos = rdr.chpos - 2u;
         let mut acc = ~"/*";
         while !(rdr.curr == '*' && nextch(rdr) == '/') && !is_eof(rdr) {
-            str::push_char(acc, rdr.curr);
+            str::push_char(&mut acc, rdr.curr);
             bump(rdr);
         }
         if is_eof(rdr) {
@@ -288,11 +288,11 @@ fn scan_exponent(rdr: string_reader) -> Option<~str> {
     let mut c = rdr.curr;
     let mut rslt = ~"";
     if c == 'e' || c == 'E' {
-        str::push_char(rslt, c);
+        str::push_char(&mut rslt, c);
         bump(rdr);
         c = rdr.curr;
         if c == '-' || c == '+' {
-            str::push_char(rslt, c);
+            str::push_char(&mut rslt, c);
             bump(rdr);
         }
         let exponent = scan_digits(rdr, 10u);
@@ -309,7 +309,7 @@ fn scan_digits(rdr: string_reader, radix: uint) -> ~str {
         if c == '_' { bump(rdr); loop; }
         match char::to_digit(c, radix) {
           Some(_) => {
-            str::push_char(rslt, c);
+            str::push_char(&mut rslt, c);
             bump(rdr);
           }
           _ => return rslt
@@ -447,7 +447,7 @@ fn next_token_inner(rdr: string_reader) -> token::token {
             || (c >= '0' && c <= '9')
             || c == '_'
             || (c > 'z' && char::is_XID_continue(c)) {
-            str::push_char(accum_str, c);
+            str::push_char(&mut accum_str, c);
             bump(rdr);
             c = rdr.curr;
         }
@@ -599,28 +599,31 @@ fn next_token_inner(rdr: string_reader) -> token::token {
                 let escaped = rdr.curr;
                 bump(rdr);
                 match escaped {
-                  'n' => str::push_char(accum_str, '\n'),
-                  'r' => str::push_char(accum_str, '\r'),
-                  't' => str::push_char(accum_str, '\t'),
-                  '\\' => str::push_char(accum_str, '\\'),
-                  '\'' => str::push_char(accum_str, '\''),
-                  '"' => str::push_char(accum_str, '"'),
+                  'n' => str::push_char(&mut accum_str, '\n'),
+                  'r' => str::push_char(&mut accum_str, '\r'),
+                  't' => str::push_char(&mut accum_str, '\t'),
+                  '\\' => str::push_char(&mut accum_str, '\\'),
+                  '\'' => str::push_char(&mut accum_str, '\''),
+                  '"' => str::push_char(&mut accum_str, '"'),
                   '\n' => consume_whitespace(rdr),
                   'x' => {
-                    str::push_char(accum_str, scan_numeric_escape(rdr, 2u));
+                    str::push_char(&mut accum_str,
+                                   scan_numeric_escape(rdr, 2u));
                   }
                   'u' => {
-                    str::push_char(accum_str, scan_numeric_escape(rdr, 4u));
+                    str::push_char(&mut accum_str,
+                                   scan_numeric_escape(rdr, 4u));
                   }
                   'U' => {
-                    str::push_char(accum_str, scan_numeric_escape(rdr, 8u));
+                    str::push_char(&mut accum_str,
+                                   scan_numeric_escape(rdr, 8u));
                   }
                   c2 => {
                     rdr.fatal(fmt!("unknown string escape: %d", c2 as int));
                   }
                 }
               }
-              _ => str::push_char(accum_str, ch)
+              _ => str::push_char(&mut accum_str, ch)
             }
         }
         bump(rdr);
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 561e2ecd0b4..e99e35b596c 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -2093,13 +2093,13 @@ fn fn_header_info_to_str(opt_sty: Option<ast::self_ty_>,
     match opt_purity {
       Some(ast::impure_fn) => { }
       Some(purity) => {
-        str::push_str(s, purity_to_str(purity));
-        str::push_char(s, ' ');
+        str::push_str(&mut s, purity_to_str(purity));
+        str::push_char(&mut s, ' ');
       }
       None => {}
     }
 
-    str::push_str(s, opt_proto_to_str(opt_p));
+    str::push_str(&mut s, opt_proto_to_str(opt_p));
 
     return s;
 }