libcore: De-mode str

5 files changed, 42 insertions, 39 deletions

diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index d01aaab6723..402b4241cb3 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -14,7 +14,7 @@ impl &[u8]: ToBase64 {
 
         let len = self.len();
         let mut s = ~"";
-        str::reserve(s, ((len + 3u) / 4u) * 3u);
+        str::reserve(&mut s, ((len + 3u) / 4u) * 3u);
 
         let mut i = 0u;
 
@@ -24,10 +24,10 @@ impl &[u8]: ToBase64 {
                     (self[i + 2u] as uint);
 
             // This 24-bit number gets separated into four 6-bit numbers.
-            str::push_char(s, chars[(n >> 18u) & 63u]);
-            str::push_char(s, chars[(n >> 12u) & 63u]);
-            str::push_char(s, chars[(n >> 6u) & 63u]);
-            str::push_char(s, chars[n & 63u]);
+            str::push_char(&mut s, chars[(n >> 18u) & 63u]);
+            str::push_char(&mut s, chars[(n >> 12u) & 63u]);
+            str::push_char(&mut s, chars[(n >> 6u) & 63u]);
+            str::push_char(&mut s, chars[n & 63u]);
 
             i += 3u;
         }
@@ -38,17 +38,17 @@ impl &[u8]: ToBase64 {
           0 => (),
           1 => {
             let n = (self[i] as uint) << 16u;
-            str::push_char(s, chars[(n >> 18u) & 63u]);
-            str::push_char(s, chars[(n >> 12u) & 63u]);
-            str::push_char(s, '=');
-            str::push_char(s, '=');
+            str::push_char(&mut s, chars[(n >> 18u) & 63u]);
+            str::push_char(&mut s, chars[(n >> 12u) & 63u]);
+            str::push_char(&mut s, '=');
+            str::push_char(&mut s, '=');
           }
           2 => {
             let n = (self[i] as uint) << 16u | (self[i + 1u] as uint) << 8u;
-            str::push_char(s, chars[(n >> 18u) & 63u]);
-            str::push_char(s, chars[(n >> 12u) & 63u]);
-            str::push_char(s, chars[(n >> 6u) & 63u]);
-            str::push_char(s, '=');
+            str::push_char(&mut s, chars[(n >> 18u) & 63u]);
+            str::push_char(&mut s, chars[(n >> 12u) & 63u]);
+            str::push_char(&mut s, chars[(n >> 6u) & 63u]);
+            str::push_char(&mut s, '=');
           }
           _ => fail ~"Algebra is broken, please alert the math police"
         }
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 4d458db482b..6b80aa716a0 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -92,7 +92,7 @@ fn to_writer(wr: io::Writer, j: Json) {
 fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
     fn spaces(n: uint) -> ~str {
         let mut ss = ~"";
-        for n.times { str::push_str(ss, " "); }
+        for n.times { str::push_str(&mut ss, " "); }
         return ss;
     }
 
@@ -428,14 +428,14 @@ impl Parser {
 
             if (escape) {
                 match self.ch {
-                  '"' => str::push_char(res, '"'),
-                  '\\' => str::push_char(res, '\\'),
-                  '/' => str::push_char(res, '/'),
-                  'b' => str::push_char(res, '\x08'),
-                  'f' => str::push_char(res, '\x0c'),
-                  'n' => str::push_char(res, '\n'),
-                  'r' => str::push_char(res, '\r'),
-                  't' => str::push_char(res, '\t'),
+                  '"' => str::push_char(&mut res, '"'),
+                  '\\' => str::push_char(&mut res, '\\'),
+                  '/' => str::push_char(&mut res, '/'),
+                  'b' => str::push_char(&mut res, '\x08'),
+                  'f' => str::push_char(&mut res, '\x0c'),
+                  'n' => str::push_char(&mut res, '\n'),
+                  'r' => str::push_char(&mut res, '\r'),
+                  't' => str::push_char(&mut res, '\t'),
                   'u' => {
                       // Parse \u1234.
                       let mut i = 0u;
@@ -464,7 +464,7 @@ impl Parser {
                             ~"invalid \\u escape (not four digits)");
                       }
 
-                      str::push_char(res, n as char);
+                      str::push_char(&mut res, n as char);
                   }
                   _ => return self.error(~"invalid escape")
                 }
@@ -476,7 +476,7 @@ impl Parser {
                     self.bump();
                     return Ok(@res);
                 }
-                str::push_char(res, self.ch);
+                str::push_char(&mut res, self.ch);
             }
         }
 
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index 22fe049d03b..a824f5ab117 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -61,7 +61,7 @@ fn encode_inner(s: &str, full_url: bool) -> ~str {
               'a' .. 'z' |
               '0' .. '9' |
               '-' | '.' | '_' | '~' => {
-                str::push_char(out, ch);
+                str::push_char(&mut out, ch);
               }
               _ => {
                   if full_url {
@@ -72,7 +72,7 @@ fn encode_inner(s: &str, full_url: bool) -> ~str {
                       // sub-delims:
                       '!' | '$' | '&' | '"' | '(' | ')' | '*' |
                       '+' | ',' | ';' | '=' => {
-                        str::push_char(out, ch);
+                        str::push_char(&mut out, ch);
                       }
 
                       _ => out += #fmt("%%%X", ch as uint)
@@ -127,18 +127,18 @@ fn decode_inner(s: &str, full_url: bool) -> ~str {
                       // sub-delims:
                       '!' | '$' | '&' | '"' | '(' | ')' | '*' |
                       '+' | ',' | ';' | '=' => {
-                        str::push_char(out, '%');
-                        str::push_char(out, bytes[0u] as char);
-                        str::push_char(out, bytes[1u] as char);
+                        str::push_char(&mut out, '%');
+                        str::push_char(&mut out, bytes[0u] as char);
+                        str::push_char(&mut out, bytes[1u] as char);
                       }
 
-                      ch => str::push_char(out, ch)
+                      ch => str::push_char(&mut out, ch)
                     }
                 } else {
-                      str::push_char(out, ch);
+                      str::push_char(&mut out, ch);
                 }
               }
-              ch => str::push_char(out, ch)
+              ch => str::push_char(&mut out, ch)
             }
         }
 
@@ -170,9 +170,9 @@ fn encode_plus(s: &str) -> ~str {
             let ch = rdr.read_byte() as char;
             match ch {
               'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '.' | '-' => {
-                str::push_char(out, ch);
+                str::push_char(&mut out, ch);
               }
-              ' ' => str::push_char(out, '+'),
+              ' ' => str::push_char(&mut out, '+'),
               _ => out += #fmt("%%%X", ch as uint)
             }
         }
@@ -195,7 +195,7 @@ fn encode_form_urlencoded(m: HashMap<~str, @DVec<@~str>>) -> ~str {
             if first {
                 first = false;
             } else {
-                str::push_char(out, '&');
+                str::push_char(&mut out, '&');
                 first = false;
             }
 
@@ -248,9 +248,9 @@ fn decode_form_urlencoded(s: ~[u8]) ->
                 };
 
                 if parsing_key {
-                    str::push_char(key, ch)
+                    str::push_char(&mut key, ch)
                 } else {
-                    str::push_char(value, ch)
+                    str::push_char(&mut value, ch)
                 }
               }
             }
diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs
index 40c9589a651..a40db2c1f1f 100644
--- a/src/libstd/sha1.rs
+++ b/src/libstd/sha1.rs
@@ -271,7 +271,10 @@ mod tests {
         fn a_million_letter_a() -> ~str {
             let mut i = 0;
             let mut rs = ~"";
-            while i < 100000 { str::push_str(rs, ~"aaaaaaaaaa"); i += 1; }
+            while i < 100000 {
+                str::push_str(&mut rs, ~"aaaaaaaaaa");
+                i += 1;
+            }
             return rs;
         }
         // Test messages from FIPS 180-1
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 3dca5540b82..bc3f8162c4d 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -800,7 +800,7 @@ fn strftime(format: &str, +tm: Tm) -> ~str {
         while !rdr.eof() {
             match rdr.read_char() {
                 '%' => buf += parse_type(rdr.read_char(), &tm),
-                ch => str::push_char(buf, ch)
+                ch => str::push_char(&mut buf, ch)
             }
         }
     }