mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

expand: Rename some AstFragments to match AST structures

Browse source
This commit is contained in:
Vadim Petrochenkov 2022-01-05 13:56:45 +08:00
parent e012a191d7
commit dc7e771155
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
compiler/rustc_expand/src/expand.rs
View file

@ -178,10 +178,10 @@ ast_fragments! {
Arms(SmallVec<[ast::Arm; 1]>) { Arms(SmallVec<[ast::Arm; 1]>) {
"match arm"; many fn flat_map_arm; fn visit_arm(); fn make_arms; "match arm"; many fn flat_map_arm; fn visit_arm(); fn make_arms;
} }
Fields(SmallVec<[ast::ExprField; 1]>) { ExprFields(SmallVec<[ast::ExprField; 1]>) {
"field expression"; many fn flat_map_expr_field; fn visit_expr_field(); fn make_expr_fields; "field expression"; many fn flat_map_expr_field; fn visit_expr_field(); fn make_expr_fields;
} }
FieldPats(SmallVec<[ast::PatField; 1]>) { PatFields(SmallVec<[ast::PatField; 1]>) {
"field pattern"; "field pattern";
many fn flat_map_pat_field; many fn flat_map_pat_field;
fn visit_pat_field(); fn visit_pat_field();
@ -196,7 +196,7 @@ ast_fragments! {
Params(SmallVec<[ast::Param; 1]>) { Params(SmallVec<[ast::Param; 1]>) {
"function parameter"; many fn flat_map_param; fn visit_param(); fn make_params; "function parameter"; many fn flat_map_param; fn visit_param(); fn make_params;
} }
StructFields(SmallVec<[ast::FieldDef; 1]>) { FieldDefs(SmallVec<[ast::FieldDef; 1]>) {
"field"; "field";
many fn flat_map_field_def; many fn flat_map_field_def;
fn visit_field_def(); fn visit_field_def();
@ -231,11 +231,11 @@ impl AstFragmentKind {
| AstFragmentKind::ForeignItems | AstFragmentKind::ForeignItems
| AstFragmentKind::Crate => SupportsMacroExpansion::Yes { supports_inner_attrs: true }, | AstFragmentKind::Crate => SupportsMacroExpansion::Yes { supports_inner_attrs: true },
AstFragmentKind::Arms AstFragmentKind::Arms
| AstFragmentKind::Fields | AstFragmentKind::ExprFields
| AstFragmentKind::FieldPats | AstFragmentKind::PatFields
| AstFragmentKind::GenericParams | AstFragmentKind::GenericParams
| AstFragmentKind::Params | AstFragmentKind::Params
| AstFragmentKind::StructFields | AstFragmentKind::FieldDefs
| AstFragmentKind::Variants => SupportsMacroExpansion::No, | AstFragmentKind::Variants => SupportsMacroExpansion::No,
} }
} }
@ -249,11 +249,11 @@ impl AstFragmentKind {
AstFragmentKind::Arms => { AstFragmentKind::Arms => {
AstFragment::Arms(items.map(Annotatable::expect_arm).collect()) AstFragment::Arms(items.map(Annotatable::expect_arm).collect())
} }
AstFragmentKind::Fields => { AstFragmentKind::ExprFields => {
AstFragment::Fields(items.map(Annotatable::expect_expr_field).collect()) AstFragment::ExprFields(items.map(Annotatable::expect_expr_field).collect())
} }
AstFragmentKind::FieldPats => { AstFragmentKind::PatFields => {
AstFragment::FieldPats(items.map(Annotatable::expect_pat_field).collect()) AstFragment::PatFields(items.map(Annotatable::expect_pat_field).collect())
} }
AstFragmentKind::GenericParams => { AstFragmentKind::GenericParams => {
AstFragment::GenericParams(items.map(Annotatable::expect_generic_param).collect()) AstFragment::GenericParams(items.map(Annotatable::expect_generic_param).collect())
@ -261,8 +261,8 @@ impl AstFragmentKind {
AstFragmentKind::Params => { AstFragmentKind::Params => {
AstFragment::Params(items.map(Annotatable::expect_param).collect()) AstFragment::Params(items.map(Annotatable::expect_param).collect())
} }
AstFragmentKind::StructFields => { AstFragmentKind::FieldDefs => {
AstFragment::StructFields(items.map(Annotatable::expect_field_def).collect()) AstFragment::FieldDefs(items.map(Annotatable::expect_field_def).collect())
} }
AstFragmentKind::Variants => { AstFragmentKind::Variants => {
AstFragment::Variants(items.map(Annotatable::expect_variant).collect()) AstFragment::Variants(items.map(Annotatable::expect_variant).collect())
@ -915,11 +915,11 @@ pub fn parse_ast_fragment<'a>(
)?), )?),
AstFragmentKind::Crate => AstFragment::Crate(this.parse_crate_mod()?), AstFragmentKind::Crate => AstFragment::Crate(this.parse_crate_mod()?),
AstFragmentKind::Arms AstFragmentKind::Arms
| AstFragmentKind::Fields | AstFragmentKind::ExprFields
| AstFragmentKind::FieldPats | AstFragmentKind::PatFields
| AstFragmentKind::GenericParams | AstFragmentKind::GenericParams
| AstFragmentKind::Params | AstFragmentKind::Params
| AstFragmentKind::StructFields | AstFragmentKind::FieldDefs
| AstFragmentKind::Variants => panic!("unexpected AST fragment kind"), | AstFragmentKind::Variants => panic!("unexpected AST fragment kind"),
}) })
} }
@ -1231,7 +1231,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
if let Some(attr) = self.take_first_attr(&mut field) { if let Some(attr) = self.take_first_attr(&mut field) {
return self return self
.collect_attr(attr, Annotatable::ExprField(field), AstFragmentKind::Fields) .collect_attr(attr, Annotatable::ExprField(field), AstFragmentKind::ExprFields)
.make_expr_fields(); .make_expr_fields();
} }
@ -1243,7 +1243,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
if let Some(attr) = self.take_first_attr(&mut fp) { if let Some(attr) = self.take_first_attr(&mut fp) {
return self return self
.collect_attr(attr, Annotatable::PatField(fp), AstFragmentKind::FieldPats) .collect_attr(attr, Annotatable::PatField(fp), AstFragmentKind::PatFields)
.make_pat_fields(); .make_pat_fields();
} }
@ -1267,7 +1267,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
if let Some(attr) = self.take_first_attr(&mut sf) { if let Some(attr) = self.take_first_attr(&mut sf) {
return self return self
.collect_attr(attr, Annotatable::FieldDef(sf), AstFragmentKind::StructFields) .collect_attr(attr, Annotatable::FieldDef(sf), AstFragmentKind::FieldDefs)
.make_field_defs(); .make_field_defs();
} }

6
compiler/rustc_expand/src/placeholders.rs
View file

@ -123,7 +123,7 @@ pub fn placeholder(
span, span,
is_placeholder: true, is_placeholder: true,
}]), }]),
AstFragmentKind::Fields => AstFragment::Fields(smallvec![ast::ExprField { AstFragmentKind::ExprFields => AstFragment::ExprFields(smallvec![ast::ExprField {
attrs: Default::default(), attrs: Default::default(),
expr: expr_placeholder(), expr: expr_placeholder(),
id, id,
@ -132,7 +132,7 @@ pub fn placeholder(
span, span,
is_placeholder: true, is_placeholder: true,
}]), }]),
AstFragmentKind::FieldPats => AstFragment::FieldPats(smallvec![ast::PatField { AstFragmentKind::PatFields => AstFragment::PatFields(smallvec![ast::PatField {
attrs: Default::default(), attrs: Default::default(),
id, id,
ident, ident,
@ -159,7 +159,7 @@ pub fn placeholder(
ty: ty(), ty: ty(),
is_placeholder: true, is_placeholder: true,
}]), }]),
AstFragmentKind::StructFields => AstFragment::StructFields(smallvec![ast::FieldDef { AstFragmentKind::FieldDefs => AstFragment::FieldDefs(smallvec![ast::FieldDef {
attrs: Default::default(), attrs: Default::default(),
id, id,
ident: None, ident: None,