Rust: Update the tests and exclude total files from rust/summary/reduced-summary-statistics.

Author: geoffw0

rust/ql/integration-tests/hello-workspace/summary.cargo.expected

@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
-| Files extracted - total | 4 |
+| Files extracted - total user | 4 |
 | Files extracted - with errors | 0 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 100 |

rust/ql/integration-tests/hello-workspace/summary.rust-project.expected

@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
-| Files extracted - total | 4 |
+| Files extracted - total user | 4 |
 | Files extracted - with errors | 0 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 100 |

rust/ql/src/queries/summary/Stats.qll

@@ -142,8 +142,6 @@ predicate extractionStats(string key, int value) {
   key = "Extraction warnings" and
   value = count(ExtractionWarning w | not exists(w.getLocation()) or w.getLocation().fromSource())
   or
-  key = "Files extracted - total" and value = count(File f)
-  or
   key = "Files extracted - total user" and value = count(ExtractedFile f | exists(f.getRelativePath()))
   or
   key = "Files extracted - with errors" and
@@ -173,6 +171,13 @@ predicate extractionStats(string key, int value) {
   value = count(MacroCall mc | mc.fromSource() and not mc.hasMacroCallExpansion())
 }
 
+/**
+ * Gets further summary statistics about extraction.
+ */
+predicate extractionStatsExtra(string key, int value) {
+  key = "Files extracted - total" and value = count(File f)
+}
+
 /**
  * Gets summary statistics about inconsistencies.
  */

rust/ql/src/queries/summary/SummaryStats.ql

@@ -15,6 +15,8 @@ where
   or
   extractionStats(key, value)
   or
+  extractionStatsExtra(key, value)
+  or
   inconsistencyStats(key, value)
   or
   typeInferenceInconsistencyStats(key, value)

rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected

@@ -1,6 +1,6 @@
 | Extraction errors | 0 |
 | Extraction warnings | 7 |
-| Files extracted - total | 7 |
+| Files extracted - total user | 7 |
 | Files extracted - with errors | 3 |
 | Files extracted - without errors | 4 |
 | Files extracted - without errors % | 57 |