diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/fmt.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 29 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs index 6d0c499f2c8..b2ec3684b70 100644 --- a/src/libsyntax/ext/fmt.rs +++ b/src/libsyntax/ext/fmt.rs @@ -276,6 +276,9 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span, stms.push(cx.stmt_let(fmt_sp, npieces > 1, ident, cx.expr_str_uniq(fmt_sp, s))); } else { + // we call the push_str function because the + // bootstrap doesnt't seem to work if we call the + // method. let args = ~[cx.expr_mut_addr_of(fmt_sp, buf()), cx.expr_str(fmt_sp, s)]; let call = cx.expr_call_global(fmt_sp, ~[core_ident, diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index a715ede7664..89fd5c3762a 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -125,7 +125,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str { fn read_to_eol(rdr: @mut StringReader) -> ~str { let mut val = ~""; while rdr.curr != '\n' && !is_eof(rdr) { - str::push_char(&mut val, rdr.curr); + val.push_char(rdr.curr); bump(rdr); } if rdr.curr == '\n' { bump(rdr); } @@ -237,7 +237,7 @@ fn read_block_comment(rdr: @mut StringReader, // doc-comments are not really comments, they are attributes if rdr.curr == '*' || rdr.curr == '!' { while !(rdr.curr == '*' && nextch(rdr) == '/') && !is_eof(rdr) { - str::push_char(&mut curr_line, rdr.curr); + curr_line.push_char(rdr.curr); bump(rdr); } if !is_eof(rdr) { @@ -261,7 +261,7 @@ fn read_block_comment(rdr: @mut StringReader, curr_line = ~""; bump(rdr); } else { - str::push_char(&mut curr_line, rdr.curr); + curr_line.push_char(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 2dc8008f8ec..809a222352f 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -358,11 +358,11 @@ fn scan_exponent(rdr: @mut StringReader) -> Option<~str> { let mut c = rdr.curr; let mut rslt = ~""; if c == 'e' || c == 'E' { - str::push_char(&mut rslt, c); + rslt.push_char(c); bump(rdr); c = rdr.curr; if c == '-' || c == '+' { - str::push_char(&mut rslt, c); + rslt.push_char(c); bump(rdr); } let exponent = scan_digits(rdr, 10u); @@ -379,7 +379,7 @@ fn scan_digits(rdr: @mut StringReader, radix: uint) -> ~str { if c == '_' { bump(rdr); loop; } match char::to_digit(c, radix) { Some(_) => { - str::push_char(&mut rslt, c); + rslt.push_char(c); bump(rdr); } _ => return rslt @@ -721,31 +721,28 @@ fn next_token_inner(rdr: @mut StringReader) -> token::Token { let escaped = rdr.curr; bump(rdr); match escaped { - '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' => accum_str.push_char('\n'), + 'r' => accum_str.push_char('\r'), + 't' => accum_str.push_char('\t'), + '\\' => accum_str.push_char('\\'), + '\'' => accum_str.push_char('\''), + '"' => accum_str.push_char('"'), '\n' => consume_whitespace(rdr), 'x' => { - str::push_char(&mut accum_str, - scan_numeric_escape(rdr, 2u)); + accum_str.push_char(scan_numeric_escape(rdr, 2u)); } 'u' => { - str::push_char(&mut accum_str, - scan_numeric_escape(rdr, 4u)); + accum_str.push_char(scan_numeric_escape(rdr, 4u)); } 'U' => { - str::push_char(&mut accum_str, - scan_numeric_escape(rdr, 8u)); + accum_str.push_char(scan_numeric_escape(rdr, 8u)); } c2 => { rdr.fatal(fmt!("unknown string escape: %d", c2 as int)); } } } - _ => str::push_char(&mut accum_str, ch) + _ => accum_str.push_char(ch) } } bump(rdr); |
