bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #66903 - Centril:parse-enum-variant, r=estebank

Browse source 
parse_enum_item -> parse_enum_variant

r? @estebank
This commit is contained in:
Mazdak Farrokhzad 2019-12-03 19:41:51 +01:00 • committed by GitHub
commit d4b623547f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_parse/parser/item.rs
View file

@ -1325,7 +1325,7 @@ impl<'a> Parser<'a> {
let (variants, _) = self.parse_delim_comma_seq( let (variants, _) = self.parse_delim_comma_seq(
token::Brace, token::Brace,
|p| p.parse_enum_item(), |p| p.parse_enum_variant(),
).map_err(|e| { ).map_err(|e| {
self.recover_stmt(); self.recover_stmt();
e e
@ -1337,7 +1337,7 @@ impl<'a> Parser<'a> {
Ok((id, ItemKind::Enum(enum_definition, generics), None)) Ok((id, ItemKind::Enum(enum_definition, generics), None))
} }
fn parse_enum_item(&mut self) -> PResult<'a, Option<Variant>> { fn parse_enum_variant(&mut self) -> PResult<'a, Option<Variant>> {
let variant_attrs = self.parse_outer_attributes()?; let variant_attrs = self.parse_outer_attributes()?;
let vlo = self.token.span; let vlo = self.token.span;