Rust: Define SuccessfullyExtractedFile and use it to simplify queries.

Author: geoffw0

rust/ql/lib/codeql/files/FileSystem.qll

@@ -5,6 +5,7 @@ private import codeql.util.FileSystem
 private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
+private import codeql.rust.Diagnostics
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -56,3 +57,20 @@ class File extends Container, Impl::File {
       )
   }
 }
+
+/**
+ * A successfully extracted file, that is, a file that was extracted and
+ * contains no extraction errors or warnings.
+ */
+class SuccessfullyExtractedFile extends File {
+  SuccessfullyExtractedFile() {
+    not exists(Diagnostic d |
+      d.getLocation().getFile() = this and
+      (
+        d instanceof ExtractionError
+        or
+        d instanceof ExtractionWarning
+      )
+    )
+  }
+}

rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql

@@ -2,14 +2,15 @@
  * @id rust/summary/number-of-files-extracted-with-errors
  * @name Total number of Rust files that were extracted with errors
  * @description The total number of Rust files in the source code directory that
- *  were extracted, but where at least one extraction error occurred in the process.
+ *  were extracted, but where at least one extraction error (or warning) occurred
+ *  in the process.
  * @kind metric
  * @tags summary
  */
 
 import codeql.files.FileSystem
-import codeql.rust.Diagnostics
 
 select count(File f |
-    exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
+    exists(f.getRelativePath()) and
+    not f instanceof SuccessfullyExtractedFile
   )

rust/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql

@@ -2,14 +2,11 @@
  * @id rust/summary/number-of-successfully-extracted-files
  * @name Total number of Rust files that were extracted without error
  * @description The total number of Rust files in the source code directory that
- *  were extracted without encountering any extraction errors.
+ *  were extracted without encountering any extraction errors (or warnings).
  * @kind metric
  * @tags summary
  */
 
-import codeql.rust.Diagnostics
 import codeql.files.FileSystem
 
-select count(File f |
-    not exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())
-  )
+select count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))