Skip to content

Commit 9bba666

Browse files
committed
Rust: QL Test: exclude crate graph related elements
1 parent c601adf commit 9bba666

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

rust/ql/test/TestUtils.qll

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
private import rust
22

3-
predicate toBeTested(Element e) { any() }
3+
predicate toBeTested(Element e) { not e instanceof CrateElement }
4+
5+
class CrateElement extends Element {
6+
CrateElement() {
7+
this instanceof Crate or
8+
any(Crate c).getModule() = this.(AstNode).getParentNode*()
9+
}
10+
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import codeql.rust.elements
2+
import TestUtils
23

3-
select any(AstNode n)
4+
select any(AstNode n | toBeTested(n))

rust/ql/test/library-tests/path-resolution/path-resolution.ql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import rust
22
import codeql.rust.elements.internal.PathResolution
33
import utils.test.InlineExpectationsTest
4+
import TestUtils
45

5-
query predicate mod(Module m) { any() }
6+
query predicate mod(Module m) { toBeTested(m) }
67

7-
query predicate resolvePath(Path p, ItemNode i) { i = resolvePath(p) }
8+
query predicate resolvePath(Path p, ItemNode i) { toBeTested(p) and i = resolvePath(p) }
89

910
module ResolveTest implements TestSig {
1011
string getARelevantTag() { result = "item" }

0 commit comments

Comments
 (0)