diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-02-04 11:07:36 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-02-04 11:58:30 -0800 |
| commit | e08a805b306398b316a489f76960569ac19b25b2 (patch) | |
| tree | 2099ffddadee1671642155cf2086fca581f5cfbc /src/libsyntax/parse/parser.rs | |
| parent | 27e1ac5bb93626da70135e167a6596d854e7e679 (diff) | |
| parent | aa9c28ef47d8b6a57e91b5468d70900d8e4172de (diff) | |
| download | rust-e08a805b306398b316a489f76960569ac19b25b2.tar.gz rust-e08a805b306398b316a489f76960569ac19b25b2.zip | |
Merge remote-tracking branch 'bstrie/rimov' into incoming
Conflicts: src/libsyntax/parse/parser.rs src/test/bench/graph500-bfs.rs src/test/bench/sudoku.rs src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs src/test/run-pass/empty-mutable-vec.rs src/test/run-pass/foreach-nested.rs src/test/run-pass/swap-2.rs
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 3c7250112ab..5cd78dd9049 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -194,7 +194,7 @@ pub fn Parser(sess: parse_sess, token: tok0.tok, span: span0, last_span: span0, - buffer: [mut TokenAndSpan {tok: tok0.tok, sp: span0}, ..4], + mut buffer: [TokenAndSpan {tok: tok0.tok, sp: span0}, ..4], buffer_start: 0, buffer_end: 0, tokens_consumed: 0u, @@ -214,7 +214,7 @@ pub struct Parser { mut token: token::Token, mut span: span, mut last_span: span, - mut buffer: [mut TokenAndSpan * 4], + mut buffer: [TokenAndSpan * 4], mut buffer_start: int, mut buffer_end: int, mut tokens_consumed: uint, |