Merge pull request #18115 from paldepind/rust-rename-expr

Rust: Rename `expr` on `CallExpr` and `LetExpr`
github · Nov 27, 2024 · 46abb90 · 46abb90
2 parents 8f886c6 + 92427ab
commit 46abb90
Show file tree

Hide file tree

Showing 30 changed files with 108 additions and 98 deletions.
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
@@ -28,8 +28,10 @@ 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",
+        ("CallExpr", "expr") => "function",
+        ("LetExpr", "expr") => "scrutinee",
         ("MatchExpr", "expr") => "scrutinee",
+        ("Path", "segment") => "part",
         (_, "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/.gitattributes b/rust/ql/.gitattributes
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -313,7 +313,7 @@ module ExprTrees {
 
   class CallExprTree extends StandardPostOrderTree instanceof CallExpr {
     override AstNode getChildNode(int i) {
-      i = 0 and result = super.getExpr()
+      i = 0 and result = super.getFunction()
       or
       result = super.getArgList().getArg(i - 1)
     }
@@ -410,7 +410,7 @@ module ExprTrees {
   class LetExprTree extends StandardPreOrderTree, LetExpr {
     override AstNode getChildNode(int i) {
       i = 0 and
-      result = this.getExpr()
+      result = this.getScrutinee()
       or
       i = 1 and
       result = this.getPat()