Rust: add some toString implementations

rust/ql/integration-tests/hello-project/functions.expected

@@ -1 +1 @@
-| src/main.rs:4:1:6:1 | main |
+| src/main.rs:4:1:6:1 | fn main |

rust/ql/integration-tests/hello-workspace/functions.expected

@@ -1,2 +1,2 @@
-| exe/src/main.rs:5:1:7:1 | main |
-| lib/src/a_module/mod.rs:1:1:3:1 | hello |
+| exe/src/main.rs:5:1:7:1 | fn main |
+| lib/src/a_module/mod.rs:1:1:3:1 | fn hello |

rust/ql/integration-tests/options/cfg/functions.expected

@@ -1,3 +1,3 @@
-| src/lib.rs:7:1:8:19 | cfg_no_flag |
-| src/lib.rs:10:1:11:18 | cfg_no_key |
-| src/lib.rs:16:1:17:24 | pointer_width_64 |
+| src/lib.rs:7:1:8:19 | fn cfg_no_flag |
+| src/lib.rs:10:1:11:18 | fn cfg_no_key |
+| src/lib.rs:16:1:17:24 | fn pointer_width_64 |

rust/ql/integration-tests/options/cfg/functions.override.expected

@@ -1,4 +1,4 @@
-| src/lib.rs:1:1:2:16 | cfg_flag |
-| src/lib.rs:4:1:5:15 | cfg_key |
-| src/lib.rs:13:1:14:12 | test |
-| src/lib.rs:19:1:20:24 | pointer_width_32 |
+| src/lib.rs:1:1:2:16 | fn cfg_flag |
+| src/lib.rs:4:1:5:15 | fn cfg_key |
+| src/lib.rs:13:1:14:12 | fn test |
+| src/lib.rs:19:1:20:24 | fn pointer_width_32 |

rust/ql/integration-tests/options/features/functions.all.expected

@@ -1,3 +1,3 @@
-| src/lib.rs:1:1:2:11 | foo |
-| src/lib.rs:4:1:5:11 | bar |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:1:1:2:11 | fn foo |
+| src/lib.rs:4:1:5:11 | fn bar |
+| src/lib.rs:7:1:7:14 | fn always |

rust/ql/integration-tests/options/features/functions.bar.expected

@@ -1,2 +1,2 @@
-| src/lib.rs:4:1:5:11 | bar |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:4:1:5:11 | fn bar |
+| src/lib.rs:7:1:7:14 | fn always |

rust/ql/integration-tests/options/features/functions.expected

@@ -1 +1 @@
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:7:1:7:14 | fn always |

rust/ql/integration-tests/options/features/functions.foo.expected

@@ -1,2 +1,2 @@
-| src/lib.rs:1:1:2:11 | foo |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:1:1:2:11 | fn foo |
+| src/lib.rs:7:1:7:14 | fn always |

rust/ql/integration-tests/options/target/functions.Darwin.expected

@@ -1 +1 @@
-| src/lib.rs:7:1:8:13 | macos |
+| src/lib.rs:7:1:8:13 | fn macos |

rust/ql/integration-tests/options/target/functions.Linux.expected

@@ -1 +1 @@
-| src/lib.rs:1:1:2:13 | linux |
+| src/lib.rs:1:1:2:13 | fn linux |

rust/ql/integration-tests/options/target/functions.Windows.expected

@@ -1 +1 @@
-| src/lib.rs:4:1:5:15 | windows |
+| src/lib.rs:4:1:5:15 | fn windows |

rust/ql/integration-tests/qltest/dependencies/functions.nested.expected

@@ -0,0 +1 @@
+| test.rs:4:1:7:1 | fn foo |

rust/ql/integration-tests/qltest/lib/functions.nested.expected

@@ -0,0 +1 @@
+| test.rs:1:1:1:11 | fn foo |

rust/ql/integration-tests/qltest/main/functions.nested.expected

@@ -0,0 +1,2 @@
+| main.rs:1:1:1:12 | fn main |
+| test.rs:1:1:1:11 | fn foo |

rust/ql/integration-tests/qltest/test.py → rust/ql/integration-tests/qltest/test_qltest.py

@@ -11,10 +11,12 @@ def default_options(codeql):
         threads = 1,
         show_extractor_output = True,
         check_databases = False,
+        learn = True,
     )
 
 @pytest.mark.parametrize("dir", ["lib", "main", "dependencies"])
-def test(codeql, rust, dir):
+def test(codeql, rust, expected_files, dir):
+    expected_files.add(f"{dir}/functions.expected", expected=".nested.expected")
     codeql.test.run(dir)
 
 def test_failing_cargo_check(codeql, rust):

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

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ArrayExpr`.
  *
@@ -12,12 +11,15 @@ private import codeql.rust.elements.internal.generated.ArrayExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An array expression. For example:
    * ```rust
    * [1, 2, 3];
    * [1; 10];
    * ```
    */
-  class ArrayExpr extends Generated::ArrayExpr { }
+  class ArrayExpr extends Generated::ArrayExpr {
+    override string toString() { result = "[...]" }
+  }
 }

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

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `AwaitExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.AwaitExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An `await` expression. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * }
    * ```
    */
-  class AwaitExpr extends Generated::AwaitExpr { }
+  class AwaitExpr extends Generated::AwaitExpr {
+    override string toString() { result = "await ..." }
+  }
 }

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

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BecomeExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.BecomeExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A `become` expression. For example:
    * ```rust
@@ -24,5 +24,7 @@ module Impl {
    * }
    * ```
    */
-  class BecomeExpr extends Generated::BecomeExpr { }
+  class BecomeExpr extends Generated::BecomeExpr {
+    override string toString() { result = "become ..." }
+  }
 }