diff options
| author | bors <bors@rust-lang.org> | 2013-07-18 03:22:45 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-18 03:22:45 -0700 |
| commit | 0335339c184e46eac958841e0e021dbdab873efd (patch) | |
| tree | 9ff2e563d52a251fb3640652a12f812c2322abd5 /src/libsyntax/parse | |
| parent | cee5c4ad11d348f0aa6487f5d01c8f660c7f5853 (diff) | |
| parent | 3b158b3e425b8adb42eab076acc9962bb22783ca (diff) | |
| download | rust-0335339c184e46eac958841e0e021dbdab873efd.tar.gz rust-0335339c184e46eac958841e0e021dbdab873efd.zip | |
auto merge of #7876 : pnkfelix/rust/fsk-silence-warnings-from-bootstrap-build, r=alexcrichton
r? anyone The only bit that I'm a little concerned about is whether there's some way the assignments to `hi` could somehow still be necessary; but I think that could only be the case if it had been `&const` borrowed (or whatever the hypothetical syntax is for that), and that's not going on in this file.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 42951543cd2..fb5d3b5262c 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2713,7 +2713,6 @@ impl Parser { token::LBRACE => { self.bump(); let (_, _) = self.parse_pat_fields(); - hi = self.span.hi; self.bump(); self.obsolete(*self.span, ObsoleteRecordPattern); pat = pat_wild; @@ -2744,7 +2743,6 @@ impl Parser { } } if fields.len() == 1 { self.expect(&token::COMMA); } - hi = self.span.hi; self.expect(&token::RPAREN); pat = pat_tup(fields); } @@ -2760,7 +2758,6 @@ impl Parser { self.bump(); let (before, slice, after) = self.parse_pat_vec_elements(); - hi = self.span.hi; self.expect(&token::RBRACKET); pat = ast::pat_vec(before, slice, after); hi = self.last_span.hi; @@ -4654,7 +4651,7 @@ impl Parser { pub fn parse_item(&self, attrs: ~[attribute]) -> Option<@ast::item> { match self.parse_item_or_view_item(attrs, true) { - iovi_none(attrs) => + iovi_none(_) => None, iovi_view_item(_) => self.fatal("view items are not allowed here"), @@ -4824,7 +4821,6 @@ impl Parser { // First, parse view items. let mut view_items : ~[ast::view_item] = ~[]; let mut items = ~[]; - let mut done = false; // I think this code would probably read better as a single // loop with a mutable three-state-variable (for extern mods, // view items, and regular items) ... except that because |