Rust: make CallExpr.toString use call identifier if present

Author: Paolo Tranquilli

rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll

@@ -5,6 +5,7 @@
  */
 
 private import codeql.rust.elements.internal.generated.CallExpr
+private import codeql.rust.elements.PathExpr
 
 /**
  * INTERNAL: This module contains the customizable definition of `CallExpr` and should not
@@ -22,6 +23,15 @@ module Impl {
    * ```
    */
   class CallExpr extends Generated::CallExpr {
-    override string toString() { result = "... (...)" }
+    override string toString() {
+      exists(string callee |
+        (
+          callee = this.getExpr().(PathExpr).toString()
+          or
+          not this.getExpr() instanceof PathExpr and callee = "..."
+        ) and
+        result = callee + "(...)"
+      )
+    }
   }
 }

rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected

@@ -1 +1 @@
-| gen_await_expr.rs:6:17:6:27 | await ... | gen_await_expr.rs:6:17:6:21 | ... (...) |
+| gen_await_expr.rs:6:17:6:27 | await ... | gen_await_expr.rs:6:17:6:21 | foo(...) |

rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected

@@ -1 +1 @@
-| gen_become_expr.rs:8:10:8:36 | become ... | gen_become_expr.rs:8:17:8:36 | ... (...) |
+| gen_become_expr.rs:8:10:8:36 | become ... | gen_become_expr.rs:8:17:8:36 | fact_a(...) |

rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected

@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | ... (...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:6:5:6:23 | ... (...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:7:5:7:14 | ... (...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:8:5:8:10 | ... (...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |

rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected

@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | ... (...) | gen_call_expr.rs:5:8:5:11 | ArgList |
-| gen_call_expr.rs:6:5:6:23 | ... (...) | gen_call_expr.rs:6:20:6:23 | ArgList |
-| gen_call_expr.rs:7:5:7:14 | ... (...) | gen_call_expr.rs:7:11:7:14 | ArgList |
-| gen_call_expr.rs:8:5:8:10 | ... (...) | gen_call_expr.rs:8:8:8:10 | ArgList |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:8:5:11 | ArgList |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:20:6:23 | ArgList |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | gen_call_expr.rs:7:11:7:14 | ArgList |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | gen_call_expr.rs:8:8:8:10 | ArgList |

rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected

@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | ... (...) | gen_call_expr.rs:5:5:5:7 | foo |
-| gen_call_expr.rs:6:5:6:23 | ... (...) | gen_call_expr.rs:6:5:6:19 | foo::<...> |
-| gen_call_expr.rs:7:5:7:14 | ... (...) | gen_call_expr.rs:7:5:7:10 | ...[...] |
-| gen_call_expr.rs:8:5:8:10 | ... (...) | gen_call_expr.rs:8:5:8:7 | foo |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:5:5:7 | foo |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:5:6:19 | foo::<...> |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | gen_call_expr.rs:7:5:7:10 | ...[...] |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | gen_call_expr.rs:8:5:8:7 | foo |

rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected

@@ -1,2 +1,2 @@
-| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | ... (...) |
-| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | ... (...) |
+| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | start(...) |
+| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | finish(...) |

rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected

@@ -1,4 +1,4 @@
 | gen_let_stmt.rs:5:5:5:15 | let x = ... | gen_let_stmt.rs:5:13:5:14 | 42 |
 | gen_let_stmt.rs:6:5:6:20 | let x = ... | gen_let_stmt.rs:6:18:6:19 | 42 |
 | gen_let_stmt.rs:9:5:9:24 | let TuplePat = ... | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
-| gen_let_stmt.rs:10:5:12:6 | let TupleStructPat = ... else { ... } | gen_let_stmt.rs:10:19:10:38 | ... (...) |
+| gen_let_stmt.rs:10:5:12:6 | let TupleStructPat = ... else { ... } | gen_let_stmt.rs:10:19:10:38 | std::env::var(...) |

rust/ql/test/library-tests/dataflow/global/viableCallable.expected

@@ -1,24 +1,24 @@
-| main.rs:13:5:13:13 | ... (...) | main.rs:1:1:3:1 | fn source |
-| main.rs:17:13:17:23 | ... (...) | main.rs:12:1:14:1 | fn get_data |
-| main.rs:18:5:18:11 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:22:5:22:15 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:26:13:26:21 | ... (...) | main.rs:1:1:3:1 | fn source |
-| main.rs:27:5:27:14 | ... (...) | main.rs:21:1:23:1 | fn data_in |
-| main.rs:35:13:35:21 | ... (...) | main.rs:1:1:3:1 | fn source |
-| main.rs:36:13:36:27 | ... (...) | main.rs:30:1:32:1 | fn pass_through |
-| main.rs:37:5:37:11 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:49:9:49:15 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:55:13:55:21 | ... (...) | main.rs:1:1:3:1 | fn source |
+| main.rs:13:5:13:13 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:17:13:17:23 | get_data(...) | main.rs:12:1:14:1 | fn get_data |
+| main.rs:18:5:18:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:22:5:22:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:26:13:26:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:27:5:27:14 | data_in(...) | main.rs:21:1:23:1 | fn data_in |
+| main.rs:35:13:35:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:36:13:36:27 | pass_through(...) | main.rs:30:1:32:1 | fn pass_through |
+| main.rs:37:5:37:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:49:9:49:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:55:13:55:21 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:69:13:69:25 | ... .get_data(...) | main.rs:51:5:57:5 | fn get_data |
-| main.rs:70:5:70:11 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:75:13:75:21 | ... (...) | main.rs:1:1:3:1 | fn source |
+| main.rs:70:5:70:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:75:13:75:21 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:76:5:76:17 | ... .data_in(...) | main.rs:48:5:50:5 | fn data_in |
-| main.rs:81:13:81:21 | ... (...) | main.rs:1:1:3:1 | fn source |
+| main.rs:81:13:81:21 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:82:5:82:22 | ... .data_through(...) | main.rs:58:5:64:5 | fn data_through |
-| main.rs:83:5:83:11 | ... (...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:87:5:87:22 | ... (...) | main.rs:16:1:19:1 | fn data_out_of_call |
-| main.rs:88:5:88:21 | ... (...) | main.rs:25:1:28:1 | fn data_in_to_call |
-| main.rs:89:5:89:23 | ... (...) | main.rs:34:1:38:1 | fn data_through_call |
-| main.rs:91:5:91:24 | ... (...) | main.rs:67:1:71:1 | fn data_out_of_method |
-| main.rs:92:5:92:28 | ... (...) | main.rs:73:1:77:1 | fn data_in_to_method_call |
-| main.rs:93:5:93:25 | ... (...) | main.rs:79:1:84:1 | fn data_through_method |
+| main.rs:83:5:83:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:87:5:87:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
+| main.rs:88:5:88:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
+| main.rs:89:5:89:23 | data_through_call(...) | main.rs:34:1:38:1 | fn data_through_call |
+| main.rs:91:5:91:24 | data_out_of_method(...) | main.rs:67:1:71:1 | fn data_out_of_method |
+| main.rs:92:5:92:28 | data_in_to_method_call(...) | main.rs:73:1:77:1 | fn data_in_to_method_call |
+| main.rs:93:5:93:25 | data_through_method(...) | main.rs:79:1:84:1 | fn data_through_method |

rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

@@ -5,12 +5,12 @@
 | main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | [SSA] s |
 | main.rs:19:9:19:9 | [SSA] s | main.rs:20:10:20:10 | s |
 | main.rs:19:9:19:9 | s | main.rs:19:9:19:9 | [SSA] s |
-| main.rs:19:13:19:21 | ... (...) | main.rs:19:9:19:9 | s |
+| main.rs:19:13:19:21 | source(...) | main.rs:19:9:19:9 | s |
 | main.rs:23:18:23:21 | [SSA] cond | main.rs:26:16:26:19 | cond |
 | main.rs:23:18:23:21 | cond | main.rs:23:18:23:21 | [SSA] cond |
 | main.rs:24:9:24:9 | [SSA] a | main.rs:26:23:26:23 | a |
 | main.rs:24:9:24:9 | a | main.rs:24:9:24:9 | [SSA] a |
-| main.rs:24:13:24:21 | ... (...) | main.rs:24:9:24:9 | a |
+| main.rs:24:13:24:21 | source(...) | main.rs:24:9:24:9 | a |
 | main.rs:25:9:25:9 | [SSA] b | main.rs:26:34:26:34 | b |
 | main.rs:25:9:25:9 | b | main.rs:25:9:25:9 | [SSA] b |
 | main.rs:25:13:25:13 | 2 | main.rs:25:9:25:9 | b |
@@ -25,7 +25,7 @@
 | main.rs:30:21:30:21 | m | main.rs:30:21:30:21 | [SSA] m |
 | main.rs:31:9:31:9 | [SSA] a | main.rs:33:20:33:20 | a |
 | main.rs:31:9:31:9 | a | main.rs:31:9:31:9 | [SSA] a |
-| main.rs:31:13:31:21 | ... (...) | main.rs:31:9:31:9 | a |
+| main.rs:31:13:31:21 | source(...) | main.rs:31:9:31:9 | a |
 | main.rs:32:9:32:9 | [SSA] b | main.rs:36:10:36:10 | b |
 | main.rs:32:9:32:9 | b | main.rs:32:9:32:9 | [SSA] b |
 | main.rs:32:13:35:5 | match ... { ... } | main.rs:32:9:32:9 | b |
@@ -40,15 +40,15 @@
 | main.rs:44:9:44:9 | b | main.rs:44:9:44:9 | [SSA] b |
 | main.rs:44:13:46:5 | loop {...} | main.rs:44:9:44:9 | b |
 | main.rs:45:9:45:23 | (no string representation) | main.rs:44:13:46:5 | loop {...} |
-| main.rs:45:15:45:23 | ... (...) | main.rs:45:9:45:23 | (no string representation) |
+| main.rs:45:15:45:23 | source(...) | main.rs:45:9:45:23 | (no string representation) |
 | main.rs:51:9:51:13 | [SSA] i | main.rs:52:10:52:10 | i |
 | main.rs:51:9:51:13 | i | main.rs:51:9:51:13 | [SSA] i |
 | main.rs:51:17:51:17 | 1 | main.rs:51:9:51:13 | i |
 | main.rs:53:5:53:5 | [SSA] i | main.rs:54:10:54:10 | i |
 | main.rs:53:5:53:5 | i | main.rs:53:5:53:5 | [SSA] i |
 | main.rs:61:9:61:9 | [SSA] i | main.rs:62:11:62:11 | i |
 | main.rs:61:9:61:9 | i | main.rs:61:9:61:9 | [SSA] i |
-| main.rs:61:13:61:31 | ... (...) | main.rs:61:9:61:9 | i |
+| main.rs:61:13:61:31 | Box::new(...) | main.rs:61:9:61:9 | i |
 | main.rs:66:9:66:9 | [SSA] a | main.rs:67:10:67:10 | a |
 | main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | [SSA] a |
 | main.rs:66:13:66:26 | TupleExpr | main.rs:66:9:66:9 | a |
@@ -70,16 +70,16 @@
 | main.rs:97:38:97:38 | p | main.rs:97:9:97:34 | Point {...} |
 | main.rs:104:9:104:10 | [SSA] s1 | main.rs:106:11:106:12 | s1 |
 | main.rs:104:9:104:10 | s1 | main.rs:104:9:104:10 | [SSA] s1 |
-| main.rs:104:14:104:28 | ... (...) | main.rs:104:9:104:10 | s1 |
+| main.rs:104:14:104:28 | Some(...) | main.rs:104:9:104:10 | s1 |
 | main.rs:105:9:105:10 | [SSA] s2 | main.rs:110:11:110:12 | s2 |
 | main.rs:105:9:105:10 | s2 | main.rs:105:9:105:10 | [SSA] s2 |
-| main.rs:105:14:105:20 | ... (...) | main.rs:105:9:105:10 | s2 |
+| main.rs:105:14:105:20 | Some(...) | main.rs:105:9:105:10 | s2 |
 | main.rs:107:14:107:14 | [SSA] n | main.rs:107:25:107:25 | n |
 | main.rs:107:14:107:14 | n | main.rs:107:14:107:14 | [SSA] n |
-| main.rs:107:20:107:26 | ... (...) | main.rs:106:5:109:5 | match ... { ... } |
-| main.rs:108:17:108:23 | ... (...) | main.rs:106:5:109:5 | match ... { ... } |
+| main.rs:107:20:107:26 | sink(...) | main.rs:106:5:109:5 | match ... { ... } |
+| main.rs:108:17:108:23 | sink(...) | main.rs:106:5:109:5 | match ... { ... } |
 | main.rs:110:5:113:5 | match ... { ... } | main.rs:103:27:114:1 | { ... } |
 | main.rs:111:14:111:14 | [SSA] n | main.rs:111:25:111:25 | n |
 | main.rs:111:14:111:14 | n | main.rs:111:14:111:14 | [SSA] n |
-| main.rs:111:20:111:26 | ... (...) | main.rs:110:5:113:5 | match ... { ... } |
-| main.rs:112:17:112:23 | ... (...) | main.rs:110:5:113:5 | match ... { ... } |
+| main.rs:111:20:111:26 | sink(...) | main.rs:110:5:113:5 | match ... { ... } |
+| main.rs:112:17:112:23 | sink(...) | main.rs:110:5:113:5 | match ... { ... } |