Skip to content

Commit

Permalink
Rollup merge of rust-lang#66903 - Centril:parse-enum-variant, r=estebank
Browse files Browse the repository at this point in the history
parse_enum_item -> parse_enum_variant

r? @estebank
  • Loading branch information
Centril authored Dec 3, 2019
2 parents 9862193 + cb08677 commit 1a9c8e8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_parse/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ impl<'a> Parser<'a> {

let (variants, _) = self.parse_delim_comma_seq(
token::Brace,
|p| p.parse_enum_item(),
|p| p.parse_enum_variant(),
).map_err(|e| {
self.recover_stmt();
e
Expand All @@ -1337,7 +1337,7 @@ impl<'a> Parser<'a> {
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 vlo = self.token.span;

Expand Down

0 comments on commit 1a9c8e8

Please sign in to comment.