hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: minor refactoring

Browse Source
This commit is contained in:
Paolo Tranquilli
2025-05-26 09:54:01 +02:00
parent a946de48fd
commit e37a24a0d0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust/ast-generator/src/main.rs
View File

@@ -263,6 +263,7 @@ fn get_additional_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
"Fn" => vec![FieldInfo::body("body", "BlockExpr")], "Fn" => vec![FieldInfo::body("body", "BlockExpr")],
"Const" => vec![FieldInfo::body("body", "Expr")], "Const" => vec![FieldInfo::body("body", "Expr")],
"Static" => vec![FieldInfo::body("body", "Expr")], "Static" => vec![FieldInfo::body("body", "Expr")],
"Param" => vec![FieldInfo::body("pat", "Pat")],
"ClosureExpr" => vec![FieldInfo::optional("body", "Expr")], "ClosureExpr" => vec![FieldInfo::optional("body", "Expr")],
"ArrayExpr" => vec![FieldInfo::predicate("is_semicolon")], "ArrayExpr" => vec![FieldInfo::predicate("is_semicolon")],
"SelfParam" => vec![FieldInfo::predicate("is_amp")], "SelfParam" => vec![FieldInfo::predicate("is_amp")],
@@ -290,14 +291,12 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
result.extend(get_additional_fields(node)); result.extend(get_additional_fields(node));
for field in &node.fields { for field in &node.fields {
match (node.name.as_str(), field.method_name().as_str()) { let name = field.method_name();
match (node.name.as_str(), name.as_str()) {
("ArrayExpr", "expr") // The ArrayExpr type also has an 'exprs' field ("ArrayExpr", "expr") // The ArrayExpr type also has an 'exprs' field
| ("PathSegment", "ty" | "path_type") // these are broken, handling them manually | ("PathSegment", "ty" | "path_type") // these are broken, handling them manually
| ("Param", "pat") // handled manually to use `body`
=> continue, => continue,
("Param", "pat") => {
result.push(FieldInfo::body("pat", "Pat"));
continue;
},
_ => {} _ => {}
} }
let ty = match field { let ty = match field {
@@ -310,7 +309,7 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
}, },
}; };
result.push(FieldInfo { result.push(FieldInfo {
name: field.method_name(), name,
ty, ty,
}); });
} }