bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #28442 - nagisa:remove-enum-vis-field, r=alexcrichton

Browse source 
Followup on #28440 

Do not merge before the referenced PR is merged. I will fix the PR once that is merged (or close if it is not)
This commit is contained in:
bors 2015-09-18 18:51:04 +00:00
commit 72a10fa1d3
16 changed files with 15 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/parse/parser.rs
View file

@ -5185,13 +5185,10 @@ impl<'a> Parser<'a> {
let variant_attrs = self.parse_outer_attributes();
let vlo = self.span.lo;
let vis = try!(self.parse_visibility());
let ident;
let kind;
let mut args = Vec::new();
let mut disr_expr = None;
ident = try!(self.parse_ident());
let ident = try!(self.parse_ident());
if try!(self.eat(&token::OpenDelim(token::Brace)) ){
// Parse a struct variant.
all_nullary = false;
@ -5233,7 +5230,6 @@ impl<'a> Parser<'a> {
kind: kind,
id: ast::DUMMY_NODE_ID,
disr_expr: disr_expr,
vis: vis,
};
variants.push(P(spanned(vlo, self.last_span.hi, vr)));