rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Lukas Wirth
2021-09-21 16:15:30 +02:00
parent b36f12dba5
commit 83e97adfff
2 changed files with 9 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
crates/syntax/src/ast/generated/nodes.rs
View File

@@ -3618,10 +3618,7 @@ impl AstNode for DynArgListOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynArgListOwner { syntax })
CALL_EXPR | METHOD_CALL_EXPR => Some(DynArgListOwner { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3703,74 +3700,7 @@ impl AstNode for DynAttrsOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynAttrsOwner { syntax })
MACRO_CALL
| SOURCE_FILE
| CONST
| ENUM
| EXTERN_BLOCK
| EXTERN_CRATE
| FN
| IMPL
| MACRO_RULES
| MACRO_DEF
| MODULE
| STATIC
| STRUCT
| TRAIT
| TYPE_ALIAS
| UNION
| USE
| ITEM_LIST
| BLOCK_EXPR
| SELF_PARAM
| PARAM
| RECORD_FIELD
| TUPLE_FIELD
| VARIANT
| ASSOC_ITEM_LIST
| EXTERN_ITEM_LIST
| CONST_PARAM
| LIFETIME_PARAM
| TYPE_PARAM
| EXPR_STMT
| LET_STMT
| ARRAY_EXPR
| AWAIT_EXPR
| BIN_EXPR
| BOX_EXPR
| BREAK_EXPR
| CALL_EXPR
| CAST_EXPR
| CLOSURE_EXPR
| CONTINUE_EXPR
| EFFECT_EXPR
| FIELD_EXPR
| FOR_EXPR
| IF_EXPR
| INDEX_EXPR
| LITERAL
| LOOP_EXPR
| MATCH_EXPR
| METHOD_CALL_EXPR
| PAREN_EXPR
| PATH_EXPR
| PREFIX_EXPR
| RANGE_EXPR
| REF_EXPR
| RETURN_EXPR
| TRY_EXPR
| TUPLE_EXPR
| WHILE_EXPR
| YIELD_EXPR
| RECORD_EXPR_FIELD_LIST
| RECORD_EXPR_FIELD
| MATCH_ARM_LIST
| MATCH_ARM
| IDENT_PAT
| RECORD_PAT_FIELD => Some(DynAttrsOwner { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3788,12 +3718,7 @@ impl AstNode for DynGenericParamsOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynGenericParamsOwner { syntax })
ENUM | FN | IMPL | STRUCT | TRAIT | TYPE_ALIAS | UNION => {
Some(DynGenericParamsOwner { syntax })
}
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3811,10 +3736,7 @@ impl AstNode for DynLoopBodyOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynLoopBodyOwner { syntax })
FOR_EXPR | LOOP_EXPR | WHILE_EXPR => Some(DynLoopBodyOwner { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3832,10 +3754,7 @@ impl AstNode for DynModuleItemOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynModuleItemOwner { syntax })
MACRO_ITEMS | SOURCE_FILE | ITEM_LIST => Some(DynModuleItemOwner { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3855,12 +3774,7 @@ impl AstNode for DynNameOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynNameOwner { syntax })
CONST | ENUM | FN | MACRO_RULES | MACRO_DEF | MODULE | STATIC | STRUCT | TRAIT
| TYPE_ALIAS | UNION | RENAME | SELF_PARAM | RECORD_FIELD | VARIANT | CONST_PARAM
| TYPE_PARAM | IDENT_PAT => Some(DynNameOwner { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3878,12 +3792,7 @@ impl AstNode for DynTypeBoundsOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynTypeBoundsOwner { syntax })
ASSOC_TYPE_ARG | TRAIT | TYPE_ALIAS | LIFETIME_PARAM | TYPE_PARAM | WHERE_PRED => {
Some(DynTypeBoundsOwner { syntax })
}
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }
@@ -3904,13 +3813,7 @@ impl AstNode for DynVisibilityOwner {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| DynVisibilityOwner { syntax })
CONST | ENUM | EXTERN_CRATE | FN | IMPL | MACRO_RULES | MACRO_DEF | MODULE | STATIC
| STRUCT | TRAIT | TYPE_ALIAS | UNION | USE | RECORD_FIELD | TUPLE_FIELD | VARIANT => {
Some(DynVisibilityOwner { syntax })
}
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { &self.syntax } fn syntax(&self) -> &SyntaxNode { &self.syntax }
} }

6
crates/syntax/src/tests/sourcegen_ast.rs
View File

@@ -250,11 +250,7 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: &AstSrc) -> String {
} }
} }
fn cast(syntax: SyntaxNode) -> Option<Self> { fn cast(syntax: SyntaxNode) -> Option<Self> {
match syntax.kind() { Self::can_cast(syntax.kind()).then(|| #name { syntax })
#(#kinds)|* => Some(#name { syntax }),
_ => None,
}
} }
fn syntax(&self) -> &SyntaxNode { fn syntax(&self) -> &SyntaxNode {
&self.syntax &self.syntax