Skip to content

Commit 3bb89ea

Browse files
committed
Rust: Move type inference/path resolution out of elements folder
1 parent af91152 commit 3bb89ea

16 files changed

+15
-15
lines changed

Diff for: rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ private import codeql.dataflow.internal.DataFlowImpl
1010
private import rust
1111
private import SsaImpl as SsaImpl
1212
private import codeql.rust.controlflow.internal.Scope as Scope
13-
private import codeql.rust.elements.internal.PathResolution
13+
private import codeql.rust.internal.PathResolution
1414
private import codeql.rust.controlflow.ControlFlowGraph
1515
private import codeql.rust.controlflow.CfgNodes
1616
private import codeql.rust.dataflow.Ssa

Diff for: rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private import codeql.rust.elements.PathExpr
1313
*/
1414
module Impl {
1515
private import rust
16-
private import PathResolution as PathResolution
16+
private import codeql.rust.internal.PathResolution as PathResolution
1717

1818
pragma[nomagic]
1919
Path getFunctionPath(CallExpr ce) { result = ce.getFunction().(PathExpr).getPath() }

Diff for: rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.FieldExpr
1212
*/
1313
module Impl {
1414
private import rust
15-
private import TypeInference as TypeInference
15+
private import codeql.rust.internal.TypeInference as TypeInference
1616

1717
// the following QLdoc is generated: if you need to edit it, do it in the schema file
1818
/**

Diff for: rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
private import rust
88
private import codeql.rust.elements.internal.generated.MethodCallExpr
9-
private import codeql.rust.elements.internal.PathResolution
10-
private import codeql.rust.elements.internal.TypeInference
9+
private import codeql.rust.internal.PathResolution
10+
private import codeql.rust.internal.TypeInference
1111

1212
/**
1313
* INTERNAL: This module contains the customizable definition of `MethodCallExpr` and should not

Diff for: rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.RecordExpr
1212
*/
1313
module Impl {
1414
private import rust
15-
private import PathResolution as PathResolution
15+
private import codeql.rust.internal.PathResolution as PathResolution
1616

1717
// the following QLdoc is generated: if you need to edit it, do it in the schema file
1818
/**

Diff for: rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.RecordPat
1212
*/
1313
module Impl {
1414
private import rust
15-
private import PathResolution as PathResolution
15+
private import codeql.rust.internal.PathResolution as PathResolution
1616

1717
// the following QLdoc is generated: if you need to edit it, do it in the schema file
1818
/**

Diff for: rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.TupleStructPat
1212
*/
1313
module Impl {
1414
private import rust
15-
private import PathResolution as PathResolution
15+
private import codeql.rust.internal.PathResolution as PathResolution
1616

1717
// the following QLdoc is generated: if you need to edit it, do it in the schema file
1818
/**

Diff for: rust/ql/lib/codeql/rust/internal/CachedStages.qll

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ module Stages {
100100
*/
101101
cached
102102
module TypeInference {
103-
private import codeql.rust.elements.internal.Type
104-
private import codeql.rust.elements.internal.TypeInference
103+
private import codeql.rust.internal.Type
104+
private import codeql.rust.internal.TypeInference
105105

106106
/**
107107
* Always holds.

Diff for: rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
private import rust
6-
private import codeql.rust.elements.internal.PathResolution
6+
private import PathResolution
77

88
/** Holds if `p` may resolve to multiple items including `i`. */
99
query predicate multiplePathResolutions(Path p, ItemNode i) {

Diff for: rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
* Provides classes for recognizing type inference inconsistencies.
33
*/
44

5-
import codeql.rust.elements.internal.TypeInference::Consistency
5+
import TypeInference::Consistency

Diff for: rust/ql/test/library-tests/path-resolution/path-resolution.ql

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import rust
2-
import codeql.rust.elements.internal.PathResolution
3-
import codeql.rust.elements.internal.TypeInference
2+
import codeql.rust.internal.PathResolution
3+
import codeql.rust.internal.TypeInference
44
import utils.test.InlineExpectationsTest
55
import TestUtils
66

Diff for: rust/ql/test/library-tests/type-inference/type-inference.ql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import rust
2-
import codeql.rust.elements.internal.TypeInference as TypeInference
2+
import codeql.rust.internal.TypeInference as TypeInference
33
import TypeInference
44
import utils.test.InlineExpectationsTest
55

0 commit comments

Comments
 (0)