hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 20:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Rename Adt class and lift common predicates to it

Browse Source
This commit is contained in:
Simon Friis Vindum
2025-12-17 11:06:26 +01:00
parent 22bc924c26
commit ca6c054256
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rust/schema/annotations.py
View File

@@ -18,13 +18,18 @@ class LoopingExpr(LabelableExpr):
loop_body: optional["BlockExpr"] | child
@annotate(Adt, replace_bases={AstNode: Item})
@annotate(TypeItem, replace_bases={AstNode: Item})
class _:
"""
An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
"""
derive_macro_expansions: list[MacroItems] | child | rust.detach
attrs: list["Attr"] | child
generic_param_list: optional["GenericParamList"] | child
name: optional["Name"] | child
visibility: optional["Visibility"] | child
where_clause: optional["WhereClause"] | child
@annotate(Module)
@@ -1063,7 +1068,7 @@ class _:
"""
@annotate(Enum, replace_bases={Item: None}) # still an Item via Adt
@annotate(Enum, replace_bases={Item: None})
class _:
"""
An enum declaration.
@@ -1074,6 +1079,12 @@ class _:
```
"""
attrs: drop
generic_param_list: drop
name: drop
visibility: drop
where_clause: drop
@annotate(ExternBlock)
class _:
@@ -1893,7 +1904,7 @@ class _:
)
@annotate(Struct, replace_bases={Item: None}) # still an Item via Adt
@annotate(Struct, replace_bases={Item: None})
class _:
"""
A Struct. For example:
@@ -1906,6 +1917,11 @@ class _:
"""
field_list: _ | ql.db_table_name("struct_field_lists_")
attrs: drop
generic_param_list: drop
name: drop
visibility: drop
where_clause: drop
@annotate(TokenTree)
@@ -2075,7 +2091,7 @@ class _:
"""
@annotate(Union, replace_bases={Item: None}) # still an Item via Adt
@annotate(Union, replace_bases={Item: None})
class _:
"""
A union declaration.
@@ -2086,6 +2102,12 @@ class _:
```
"""
attrs: drop
generic_param_list: drop
name: drop
visibility: drop
where_clause: drop
@annotate(Use)
class _:

8
rust/schema/ast.py generated
View File

@@ -2,7 +2,7 @@
from .prelude import *
class Adt(AstNode, ):
class TypeItem(AstNode, ):
pass
class AsmOperand(AstNode, ):
@@ -206,7 +206,7 @@ class ContinueExpr(Expr, ):
class DynTraitTypeRepr(TypeRepr, ):
type_bound_list: optional["TypeBoundList"] | child
class Enum(Adt, Item, ):
class Enum(TypeItem, Item, ):
attrs: list["Attr"] | child
generic_param_list: optional["GenericParamList"] | child
name: optional["Name"] | child
@@ -623,7 +623,7 @@ class StmtList(AstNode, ):
statements: list["Stmt"] | child
tail_expr: optional["Expr"] | child
class Struct(Adt, Item, ):
class Struct(TypeItem, Item, ):
attrs: list["Attr"] | child
field_list: optional["FieldList"] | child
generic_param_list: optional["GenericParamList"] | child
@@ -712,7 +712,7 @@ class TypeParam(GenericParam, ):
class UnderscoreExpr(Expr, ):
attrs: list["Attr"] | child
class Union(Adt, Item, ):
class Union(TypeItem, Item, ):
attrs: list["Attr"] | child
generic_param_list: optional["GenericParamList"] | child
name: optional["Name"] | child