Skip to content

Commit f2f84e1

Browse files
committed
Rust: Remove Resolvable.resolvesAsItem
Removes one more use of extractor-based resolution.
1 parent 0a18db8 commit f2f84e1

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

rust/ql/.generated.list

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/.gitattributes

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll

Lines changed: 2 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@
77

88
import rust
99

10+
/**
11+
* Holds if this resolvable and the item `i` resolves to the same canonical
12+
* path in the same crate
13+
*/
14+
pragma[nomagic]
15+
private predicate resolvesAsItem(Resolvable r, Item i) {
16+
r.getResolvedPath() = i.getExtendedCanonicalPath() and
17+
(
18+
r.getResolvedCrateOrigin() = i.getCrateOrigin()
19+
or
20+
not r.hasResolvedCrateOrigin() and not i.hasCrateOrigin()
21+
)
22+
}
23+
1024
private signature module ResolvableSig {
1125
class Source {
1226
string toString();
@@ -94,7 +108,7 @@ private module PathResolution implements ResolvableSig {
94108
private module RustAnalyzerPathResolution implements CompareSig<PathResolution> {
95109
predicate isResolvable(PathResolution::Source s) { s.hasResolvedPath() }
96110

97-
Item resolve(PathResolution::Source s) { s.resolvesAsItem(result) }
111+
Item resolve(PathResolution::Source s) { resolvesAsItem(s, result) }
98112
}
99113

100114
private module QlPathResolution implements CompareSig<PathResolution> {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy