From 2f98c5ba47404d2889e6e8d1e7cb4f211fab88d4 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 11 Sep 2024 17:56:47 +0100
Subject: [PATCH 01/10] Rust: Add lines-of-code queries.

---
 rust/ql/src/queries/summary/LinesOfCode.ql        | 13 +++++++++++++
 rust/ql/src/queries/summary/LinesOfUserCode.ql    | 13 +++++++++++++
 .../src/queries/summary/LinesOfUserCodeInFiles.ql | 15 +++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 rust/ql/src/queries/summary/LinesOfCode.ql
 create mode 100644 rust/ql/src/queries/summary/LinesOfUserCode.ql
 create mode 100644 rust/ql/src/queries/summary/LinesOfUserCodeInFiles.ql

diff --git a/rust/ql/src/queries/summary/LinesOfCode.ql b/rust/ql/src/queries/summary/LinesOfCode.ql
new file mode 100644
index 000000000000..4ed20fc3f738
--- /dev/null
+++ b/rust/ql/src/queries/summary/LinesOfCode.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Total lines of Rust code in the database
+ * @description The total number of lines of Rust code across all files, including any libraries and auto-generated files that the extractor sees. This is a useful metric of the size of a database. For all files that were seen during the build, this query counts the lines of code, excluding whitespace or comments.
+ * @kind metric
+ * @id rust/summary/lines-of-code
+ * @tags summary
+ *       lines-of-code
+ *       telemetry
+ */
+
+import rust
+
+select sum(File f | | f.getNumberOfLinesOfCode())
diff --git a/rust/ql/src/queries/summary/LinesOfUserCode.ql b/rust/ql/src/queries/summary/LinesOfUserCode.ql
new file mode 100644
index 000000000000..483dce2d4253
--- /dev/null
+++ b/rust/ql/src/queries/summary/LinesOfUserCode.ql
@@ -0,0 +1,13 @@
+/**
+ * @name Total lines of user written Rust code in the database
+ * @description The total number of lines of Rust code from the source code directory. This query counts the lines of code, excluding whitespace or comments.
+ * @kind metric
+ * @id rust/summary/lines-of-user-code
+ * @tags summary
+ *       lines-of-code
+ *       debug
+ */
+
+import rust
+
+select sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
diff --git a/rust/ql/src/queries/summary/LinesOfUserCodeInFiles.ql b/rust/ql/src/queries/summary/LinesOfUserCodeInFiles.ql
new file mode 100644
index 000000000000..a3e0b3ff9a89
--- /dev/null
+++ b/rust/ql/src/queries/summary/LinesOfUserCodeInFiles.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Lines of user code in files
+ * @description Measures the number of lines of code in each file from the source directory, ignoring lines that contain only comments or whitespace.
+ * @kind metric
+ * @id rust/summary/lines-of-user-code-in-files
+ * @metricType file
+ */
+
+import rust
+
+from File f, int n
+where
+  exists(f.getRelativePath()) and
+  n = f.getNumberOfLinesOfCode()
+select f, n order by n desc

From 6e9f2a3b6193a7f1df20f8f34a177f558026b304 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:15:01 +0100
Subject: [PATCH 02/10] Rust: Add tests.

---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected        | 1 +
 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref           | 1 +
 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected    | 1 +
 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.qlref       | 1 +
 .../test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected | 1 +
 .../ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.qlref | 1 +
 6 files changed, 6 insertions(+)
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfUserCode.qlref
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.qlref

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
new file mode 100644
index 000000000000..8aa2483d0f0c
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -0,0 +1 @@
+| 6606 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref b/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
new file mode 100644
index 000000000000..6b283550e622
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
@@ -0,0 +1 @@
+queries/summary/LinesOfCode.ql
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
new file mode 100644
index 000000000000..8fdab1dc12ca
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -0,0 +1 @@
+| 8 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.qlref b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.qlref
new file mode 100644
index 000000000000..73feb9152774
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.qlref
@@ -0,0 +1 @@
+queries/summary/LinesOfUserCode.ql
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
new file mode 100644
index 000000000000..08305b9c7088
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -0,0 +1 @@
+| my_struct.rs:0:0:0:0 | my_struct.rs | 8 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.qlref b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.qlref
new file mode 100644
index 000000000000..da3e8f72ed9a
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.qlref
@@ -0,0 +1 @@
+queries/summary/LinesOfUserCodeInFiles.ql

From c124820256310edaf659941bb4c08e5179e176a0 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:46:29 +0100
Subject: [PATCH 03/10] Rust: Add summary stats query showing all of the
 summary data, for convenience.

---
 rust/ql/src/queries/summary/LinesOfCode.ql     |  3 ++-
 rust/ql/src/queries/summary/LinesOfUserCode.ql |  3 ++-
 rust/ql/src/queries/summary/Stats.qll          | 13 +++++++++++++
 rust/ql/src/queries/summary/SummaryStats.ql    | 17 +++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 rust/ql/src/queries/summary/Stats.qll
 create mode 100644 rust/ql/src/queries/summary/SummaryStats.ql

diff --git a/rust/ql/src/queries/summary/LinesOfCode.ql b/rust/ql/src/queries/summary/LinesOfCode.ql
index 4ed20fc3f738..5e38ad33f26c 100644
--- a/rust/ql/src/queries/summary/LinesOfCode.ql
+++ b/rust/ql/src/queries/summary/LinesOfCode.ql
@@ -9,5 +9,6 @@
  */
 
 import rust
+import Stats
 
-select sum(File f | | f.getNumberOfLinesOfCode())
+select getLinesOfCode()
diff --git a/rust/ql/src/queries/summary/LinesOfUserCode.ql b/rust/ql/src/queries/summary/LinesOfUserCode.ql
index 483dce2d4253..3c81c3caf22d 100644
--- a/rust/ql/src/queries/summary/LinesOfUserCode.ql
+++ b/rust/ql/src/queries/summary/LinesOfUserCode.ql
@@ -9,5 +9,6 @@
  */
 
 import rust
+import Stats
 
-select sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
+select getLinesOfUserCode()
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
new file mode 100644
index 000000000000..db68579966e3
--- /dev/null
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -0,0 +1,13 @@
+/**
+ * Predicates used in summary queries.
+ */
+
+import rust
+
+int getLinesOfCode() {
+  result = sum(File f | | f.getNumberOfLinesOfCode())
+}
+
+int getLinesOfUserCode() {
+  result = sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
+}
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
new file mode 100644
index 000000000000..fe80d2e43121
--- /dev/null
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Summary Statistics
+ * @description A table of summary statistics about a database.
+ * @kind table
+ * @id rust/summary/summary-statistics
+ * @tags summary
+ */
+
+import rust
+import Stats
+
+from string key, string value
+where
+  key = "Lines of code" and value = getLinesOfCode().toString()
+  or
+  key = "Lines of user code" and value = getLinesOfUserCode().toString()
+select key, value

From fdf079265dbad099803d238eba8399025bb9cfb8 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:47:08 +0100
Subject: [PATCH 04/10] Rust: Add test.

---
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected | 2 ++
 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref    | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref

diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
new file mode 100644
index 000000000000..951b589926ab
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -0,0 +1,2 @@
+| Lines of code | 6606 |
+| Lines of user code | 8 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref b/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
new file mode 100644
index 000000000000..b94ba40446a0
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
@@ -0,0 +1 @@
+queries/summary/SummaryStats.ql

From 6e01270fec724745ceec064b5df852c943338391 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:57:18 +0100
Subject: [PATCH 05/10] Rust: Better (still incomplete) results on latest main.

---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected    | 2 +-
 .../ql/test/query-tests/diagnostics/LinesOfUserCode.expected | 2 +-
 .../query-tests/diagnostics/LinesOfUserCodeInFiles.expected  | 5 +++++
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected   | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 8aa2483d0f0c..efe503e8221e 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 6606 |
+| 6806 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index 8fdab1dc12ca..d00cd9265cfe 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 8 |
+| 16 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index 08305b9c7088..cb81d5df9bdb 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1 +1,6 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 8 |
+| main.rs:0:0:0:0 | main.rs | 3 |
+| does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 2 |
+| my_macro.rs:0:0:0:0 | my_macro.rs | 2 |
+| error.rs:0:0:0:0 | error.rs | 1 |
+| lib.rs:0:0:0:0 | lib.rs | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 951b589926ab..6ea818eec20f 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,2 +1,2 @@
-| Lines of code | 6606 |
-| Lines of user code | 8 |
+| Lines of code | 6806 |
+| Lines of user code | 16 |

From 0d5c25b400137aa2352f5b1279d4afb2849a01b2 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:19:01 +0100
Subject: [PATCH 06/10] Rust: Repair getNumberOfLinesOfCode.

---
 rust/ql/lib/codeql/files/FileSystem.qll | 9 +++++++++
 rust/ql/src/queries/summary/Stats.qll   | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 528dde52fd91..a876c08ad5b6 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -33,4 +33,13 @@ class Folder = Impl::Folder;
 class File extends Container, Impl::File {
   /** Holds if this file was extracted from ordinary source code. */
   predicate fromSource() { any() }
+
+  /**
+   * Gets the number of lines containing code in this file. This value
+   * is approximate.
+   */
+  int getNumberOfLinesOfCode() {
+    result =
+      count(int line | exists(Location loc | loc.getFile() = this and loc.getStartLine() = line and not loc instanceof EmptyLocation))
+  }
 }
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index db68579966e3..2f3992303f3b 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -4,9 +4,7 @@
 
 import rust
 
-int getLinesOfCode() {
-  result = sum(File f | | f.getNumberOfLinesOfCode())
-}
+int getLinesOfCode() { result = sum(File f | | f.getNumberOfLinesOfCode()) }
 
 int getLinesOfUserCode() {
   result = sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())

From 551c4e83f43afd2e670e812a7a8e015b50f93b1d Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:20:23 +0100
Subject: [PATCH 07/10] Rust: Improve getNumberOfLinesOfCode (in particular, it
 will now include the closing of blocks { } ).

---
 rust/ql/lib/codeql/files/FileSystem.qll                |  8 +++++++-
 .../test/query-tests/diagnostics/LinesOfCode.expected  |  2 +-
 .../query-tests/diagnostics/LinesOfUserCode.expected   |  2 +-
 .../diagnostics/LinesOfUserCodeInFiles.expected        | 10 +++++-----
 .../test/query-tests/diagnostics/SummaryStats.expected |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index a876c08ad5b6..5588d2ecc7e5 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -40,6 +40,12 @@ class File extends Container, Impl::File {
    */
   int getNumberOfLinesOfCode() {
     result =
-      count(int line | exists(Location loc | loc.getFile() = this and loc.getStartLine() = line and not loc instanceof EmptyLocation))
+      count(int line |
+        exists(Location loc |
+          loc.getFile() = this and
+          line = [loc.getStartLine(), loc.getEndLine()] and
+          not loc instanceof EmptyLocation
+        )
+      )
   }
 }
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index efe503e8221e..794d33181739 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 6806 |
+| 13437 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index d00cd9265cfe..cec53d5df7a2 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 16 |
+| 24 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index cb81d5df9bdb..bc80df02e774 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,6 +1,6 @@
-| my_struct.rs:0:0:0:0 | my_struct.rs | 8 |
-| main.rs:0:0:0:0 | main.rs | 3 |
-| does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 2 |
-| my_macro.rs:0:0:0:0 | my_macro.rs | 2 |
-| error.rs:0:0:0:0 | error.rs | 1 |
+| my_struct.rs:0:0:0:0 | my_struct.rs | 11 |
+| main.rs:0:0:0:0 | main.rs | 4 |
+| my_macro.rs:0:0:0:0 | my_macro.rs | 4 |
+| does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
+| error.rs:0:0:0:0 | error.rs | 2 |
 | lib.rs:0:0:0:0 | lib.rs | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 6ea818eec20f..e75514ff73a8 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,2 +1,2 @@
-| Lines of code | 6806 |
-| Lines of user code | 16 |
+| Lines of code | 13437 |
+| Lines of user code | 24 |

From 00b9647aa10eacc7e5fa2f4ecbb17259236b68a1 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:43:58 +0100
Subject: [PATCH 08/10] Rust: Only test the 'user code' queries, as the
 non-user stuff is not stable between platforms.

---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected  | 1 -
 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref     | 1 -
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected | 2 --
 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref    | 1 -
 4 files changed, 5 deletions(-)
 delete mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
 delete mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
 delete mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.expected
 delete mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
deleted file mode 100644
index 794d33181739..000000000000
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ /dev/null
@@ -1 +0,0 @@
-| 13437 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref b/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
deleted file mode 100644
index 6b283550e622..000000000000
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
+++ /dev/null
@@ -1 +0,0 @@
-queries/summary/LinesOfCode.ql
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
deleted file mode 100644
index e75514ff73a8..000000000000
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| Lines of code | 13437 |
-| Lines of user code | 24 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref b/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
deleted file mode 100644
index b94ba40446a0..000000000000
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
+++ /dev/null
@@ -1 +0,0 @@
-queries/summary/SummaryStats.ql

From 4656b3a43dfc4741b6fccf57853a94d9f1122936 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:39:50 +0100
Subject: [PATCH 09/10] Revert "Rust: Only test the 'user code' queries, as the
 non-user stuff is not stable between platforms."

This reverts commit 00b9647aa10eacc7e5fa2f4ecbb17259236b68a1.
---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected  | 1 +
 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref     | 1 +
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected | 2 ++
 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref    | 1 +
 4 files changed, 5 insertions(+)
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
 create mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.expected
 create mode 100644 rust/ql/test/query-tests/diagnostics/SummaryStats.qlref

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
new file mode 100644
index 000000000000..794d33181739
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -0,0 +1 @@
+| 13437 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref b/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
new file mode 100644
index 000000000000..6b283550e622
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.qlref
@@ -0,0 +1 @@
+queries/summary/LinesOfCode.ql
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
new file mode 100644
index 000000000000..e75514ff73a8
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -0,0 +1,2 @@
+| Lines of code | 13437 |
+| Lines of user code | 24 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref b/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
new file mode 100644
index 000000000000..b94ba40446a0
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.qlref
@@ -0,0 +1 @@
+queries/summary/SummaryStats.ql

From 7a21b3ba463177aa8b846d80d64dbe210546204a Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:42:01 +0100
Subject: [PATCH 10/10] Rust: Accept the new results.

---
 rust/ql/test/query-tests/diagnostics/LinesOfCode.expected  | 2 +-
 rust/ql/test/query-tests/diagnostics/SummaryStats.expected | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 794d33181739..cec53d5df7a2 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 13437 |
+| 24 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index e75514ff73a8..fb589100c48f 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,2 +1,2 @@
-| Lines of code | 13437 |
+| Lines of code | 24 |
 | Lines of user code | 24 |