From b40353f88f3cd078c1afd4ca40e466c34e8b7e45 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Fri, 21 Nov 2025 11:26:25 +0100
Subject: [PATCH] Rust: Remove `CallExprBase` and elaborate QL doc

---
 rust/schema/annotations.py | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 5861ede759b..03e52ed6b0a 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -228,41 +228,36 @@ class _:
     loop_body: drop
 
 
-class CallExprBase(Expr):
-    """
-    A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
-    """
-    arg_list: optional["ArgList"] | child
-    attrs: list["Attr"] | child
-    args: list["Expr"] | synth
-
-
-@annotate(CallExpr, replace_bases={Expr: CallExprBase}, cfg=True)
+@annotate(CallExpr, cfg=True)
 class _:
     """
-    A function call expression. For example:
+    NOTE: Consider using `Call` instead, as that includes all kinds of calls to
+    functions, and excludes instantiations of tuple structs and tuple enum variants.
+
+    A call expression. For example:
     ```rust
     foo(42);
     foo::<u32, u64>(42);
     foo[0](42);
     foo(1) = 4;
+    Option::Some(42); // tuple enum variant instantiation
     ```
     """
-    arg_list: drop
-    attrs: drop
 
 
-@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, cfg=True)
+@annotate(MethodCallExpr, cfg=True)
 class _:
     """
+    NOTE: Consider using `MethodCall` instead, as that also includes calls to methods using
+    function call syntax (such as `Foo::method(x)`), operator calls (such as `x + y`), and
+    indexing calls (such as `x[y]`).
+
     A method call expression. For example:
     ```rust
     x.foo(42);
     x.foo::<u32, u64>(42);
     ```
     """
-    arg_list: drop
-    attrs: drop
 
 
 @annotate(MatchArm)