Merge pull request #18107 from github/redsun82/rust-rename

Rust: rename `MatchExpr.expr` to `scrutinee` in all layers
github · Nov 26, 2024 · 9f09454 · 9f09454
2 parents cb0ac61 + 7a86257
commit 9f09454
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
@@ -29,6 +29,7 @@ fn class_name(type_name: &str) -> String {
 fn property_name(type_name: &str, field_name: &str) -> String {
     let name = match (type_name, field_name) {
         ("Path", "segment") => "part",
+        ("MatchExpr", "expr") => "scrutinee",
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",
         _ => field_name,

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
@@ -1896,9 +1896,9 @@ match_expr_attrs(
 );
 
 #keyset[id]
-match_expr_exprs(
+match_expr_scrutinees(
   int id: @match_expr ref,
-  int expr: @expr ref
+  int scrutinee: @expr ref
 );
 
 #keyset[id]

diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
@@ -289,7 +289,7 @@ class _:
     }
     ```
     """
-    expr: _ | ql.name("scrutinee") | doc("scrutinee (the expression being matched) of this match expression")
+    scrutinee: _ | doc("scrutinee (the expression being matched) of this match expression")
 
 
 @annotate(ContinueExpr, cfg = True)

diff --git a/rust/schema/ast.py b/rust/schema/ast.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,7 +289,7 @@ class _: @@
         }
         ```
         """
-        expr: _ | ql.name("scrutinee") | doc("scrutinee (the expression being matched) of this match expression")
+        scrutinee: _ | doc("scrutinee (the expression being matched) of this match expression")
     @annotate(ContinueExpr, cfg = True)
@@ Expand Down @@