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

Rust: rename `MatchExpr.expr` to `scrutinee` in all layers

Author: redsun82

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,

rust/extractor/src/generated/.generated.list

@@ -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]

rust/extractor/src/generated/top.rs

@@ -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)