Rust: update integration tests

Author: aibaars

rust/ql/integration-tests/hello-project/steps.ql

@@ -1,27 +1,5 @@
 import codeql.rust.elements.internal.ExtractorStep
 
-private class Step instanceof ExtractorStep {
-  string toString() {
-    result = super.getAction() + "(" + this.getFilePath() + ")"
-    or
-    not super.hasFile() and result = super.getAction()
-  }
-
-  private string getFilePath() {
-    exists(File file | file = super.getFile() |
-      exists(file.getRelativePath()) and result = file.getAbsolutePath()
-      or
-      not exists(file.getRelativePath()) and result = "/" + file.getBaseName()
-    )
-  }
-
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-    filepath = this.getFilePath()
-  }
-}
-
-from Step step
+from ExtractorStep step
+where not step.getAction() = ["ParseLibrary", "ExtractLibrary"]
 select step

rust/ql/integration-tests/hello-workspace/steps.ql

@@ -1,27 +1,5 @@
 import codeql.rust.elements.internal.ExtractorStep
 
-private class Step instanceof ExtractorStep {
-  string toString() {
-    result = super.getAction() + "(" + this.getFilePath() + ")"
-    or
-    not super.hasFile() and result = super.getAction()
-  }
-
-  private string getFilePath() {
-    exists(File file | file = super.getFile() |
-      exists(file.getRelativePath()) and result = file.getAbsolutePath()
-      or
-      not exists(file.getRelativePath()) and result = "/" + file.getBaseName()
-    )
-  }
-
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-    filepath = this.getFilePath()
-  }
-}
-
-from Step step
+from ExtractorStep step
+where not step.getAction() = ["ParseLibrary", "ExtractLibrary"]
 select step

rust/ql/integration-tests/macro-expansion/test.ql

@@ -1,5 +1,5 @@
 import rust
 
 from Item i, MacroItems items, int index, Item expanded
-where i.getAttributeMacroExpansion() = items and items.getItem(index) = expanded
+where i.fromSource() and i.getAttributeMacroExpansion() = items and items.getItem(index) = expanded
 select i, index, expanded

rust/ql/integration-tests/workspace-with-glob/steps.ql

@@ -1,27 +1,5 @@
 import codeql.rust.elements.internal.ExtractorStep
 
-private class Step instanceof ExtractorStep {
-  string toString() {
-    result = super.getAction() + "(" + this.getFilePath() + ")"
-    or
-    not super.hasFile() and result = super.getAction()
-  }
-
-  private string getFilePath() {
-    exists(File file | file = super.getFile() |
-      exists(file.getRelativePath()) and result = file.getAbsolutePath()
-      or
-      not exists(file.getRelativePath()) and result = "/" + file.getBaseName()
-    )
-  }
-
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-    filepath = this.getFilePath()
-  }
-}
-
-from Step step
+from ExtractorStep step
+where not step.getAction() = ["ParseLibrary", "ExtractLibrary"]
 select step