diff options
| author | bors <bors@rust-lang.org> | 2014-04-02 16:36:50 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-02 16:36:50 -0700 |
| commit | f503f6c0b90e69425952ddc3ee3c6022be769ace (patch) | |
| tree | 07ce928ee77fea3d2b0a1d0bbfe021038bd0d708 /src/libsyntax/parse | |
| parent | 3786b552a6ffd2219d8e42df6f8db6cc386cce56 (diff) | |
| parent | 9a259f4303cd6550a38ccd12b07ae14c1e21a263 (diff) | |
| download | rust-f503f6c0b90e69425952ddc3ee3c6022be769ace.tar.gz rust-f503f6c0b90e69425952ddc3ee3c6022be769ace.zip | |
auto merge of #13257 : alexcrichton/rust/index-uint, r=pnkfelix
The details are outlined in the first commit. Closes #10453
Diffstat (limited to 'src/libsyntax/parse')
| -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 83cc92d4828..b3e488a464d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -780,10 +780,10 @@ impl<'a> Parser<'a> { -> R { let dist = distance as int; while self.buffer_length() < dist { - self.buffer[self.buffer_end] = self.reader.next_token(); + self.buffer[self.buffer_end as uint] = self.reader.next_token(); self.buffer_end = (self.buffer_end + 1) & 3; } - f(&self.buffer[(self.buffer_start + dist - 1) & 3].tok) + f(&self.buffer[((self.buffer_start + dist - 1) & 3) as uint].tok) } pub fn fatal(&mut self, m: &str) -> ! { self.sess.span_diagnostic.span_fatal(self.span, m) |