Rename ast::Variant_::name into ident + Fix rebase

src/libsyntax/parse/parser.rs

@@ -6323,7 +6323,7 @@ impl<'a> Parser<'a> {
             }
 
             let vr = ast::Variant_ {
-                name: ident,
+                ident,
                 attrs: variant_attrs,
                 data: struct_def,
                 disr_expr,