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

Centril · web-flow · commit d4b623547fc2 · 2019-12-03T19:41:51.000+01:00
parse_enum_item -> parse_enum_variant r? @estebank
diff --git a/src/librustc_parse/parser/item.rs b/src/librustc_parse/parser/item.rs
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -1325,7 +1325,7 @@ impl<'a> Parser<'a> {`
`1325`	`1325`
`1326`	`1326`	`let (variants, _) = self.parse_delim_comma_seq(`
`1327`	`1327`	`token::Brace,`
`1328`		`- \|p\| p.parse_enum_item(),`
	`1328`	`+ \|p\| p.parse_enum_variant(),`
`1329`	`1329`	`).map_err(\|e\| {`
`1330`	`1330`	`self.recover_stmt();`
`1331`	`1331`	`e`
`@@ -1337,7 +1337,7 @@ impl<'a> Parser<'a> {`
`1337`	`1337`	`Ok((id, ItemKind::Enum(enum_definition, generics), None))`
`1338`	`1338`	`}`
`1339`	`1339`
`1340`		`- fn parse_enum_item(&mut self) -> PResult<'a, Option<Variant>> {`
	`1340`	`+ fn parse_enum_variant(&mut self) -> PResult<'a, Option<Variant>> {`
`1341`	`1341`	`let variant_attrs = self.parse_outer_attributes()?;`
`1342`	`1342`	`let vlo = self.token.span;`
`1343`	`1343`