Rust: Move everything type inference related into the typeinference directory

paldepind · paldepind · commit 9e74a7869aa9 · 2026-01-12T16:31:34.000+01:00
diff --git a/rust/ql/consistency-queries/TypeInferenceConsistency.ql b/rust/ql/consistency-queries/TypeInferenceConsistency.ql
@@ -5,4 +5,4 @@
  * @id rust/diagnostics/type-inference-consistency
  */
 
-import codeql.rust.internal.TypeInferenceConsistency
+import codeql.rust.internal.typeinference.TypeInferenceConsistency
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -15,7 +15,7 @@ private import codeql.rust.internal.PathResolution
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.dataflow.Ssa
 private import codeql.rust.dataflow.FlowSummary
-private import codeql.rust.internal.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
 private import codeql.rust.internal.typeinference.DerefChain
 private import Node
 private import Content
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
@@ -205,8 +205,8 @@ private module Debug {
   private import Private
   private import Content
   private import codeql.rust.dataflow.internal.DataFlowImpl
-  private import codeql.rust.internal.TypeMention
-  private import codeql.rust.internal.Type
+  private import codeql.rust.internal.typeinference.TypeMention
+  private import codeql.rust.internal.typeinference.Type
 
   private predicate relevantManualModel(SummarizedCallableImpl sc, string can) {
     exists(Provenance manual |
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -14,7 +14,7 @@ private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.Ssa
 private import codeql.rust.dataflow.FlowSummary
-private import codeql.rust.internal.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
 private import codeql.rust.internal.typeinference.DerefChain
 private import Node as Node
 private import DataFlowImpl
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -7,8 +7,8 @@ private import Node as Node
 private import Content
 private import FlowSummaryImpl as FlowSummaryImpl
 private import codeql.rust.internal.CachedStages
-private import codeql.rust.internal.TypeInference as TypeInference
-private import codeql.rust.internal.Type as Type
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.Type as Type
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -15,7 +15,7 @@ module Impl {
   private import codeql.rust.elements.internal.InvocationExprImpl::Impl as InvocationExprImpl
   private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
   private import codeql.rust.internal.PathResolution as PathResolution
-  private import codeql.rust.internal.TypeInference as TypeInference
+  private import codeql.rust.internal.typeinference.TypeInference as TypeInference
 
   pragma[nomagic]
   Path getFunctionPath(CallExpr ce) { result = ce.getFunction().(PathExpr).getPath() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
@@ -1,7 +1,7 @@
 private import rust
 
 module Impl {
-  private import codeql.rust.internal.TypeInference as TypeInference
+  private import codeql.rust.internal.typeinference.TypeInference as TypeInference
   private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
   private import codeql.rust.elements.internal.InvocationExprImpl::Impl as InvocationExprImpl
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.FieldExpr
  */
 module Impl {
   private import rust
-  private import codeql.rust.internal.TypeInference as TypeInference
+  private import codeql.rust.internal.typeinference.TypeInference as TypeInference
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll
@@ -1,7 +1,7 @@
 private import rust
 
 module Impl {
-  private import codeql.rust.internal.TypeInference as TypeInference
+  private import codeql.rust.internal.typeinference.TypeInference as TypeInference
   private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
   private newtype TArgumentPosition =
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
@@ -5,8 +5,8 @@
 private import rust
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.DataFlow
-private import codeql.rust.internal.TypeInference
-private import codeql.rust.internal.Type
+private import codeql.rust.internal.typeinference.TypeInference
+private import codeql.rust.internal.typeinference.Type
 
 bindingset[algorithmName]
 private string simplifyAlgorithmName(string algorithmName) {
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -128,8 +128,8 @@ module Stages {
    */
   cached
   module TypeInferenceStage {
-    private import codeql.rust.internal.Type
-    private import codeql.rust.internal.TypeInference
+    private import codeql.rust.internal.typeinference.Type
+    private import codeql.rust.internal.typeinference.TypeInference
 
     /**
      * Always holds.
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
@@ -7,9 +7,9 @@
 
 private import rust
 private import codeql.rust.internal.PathResolution
-private import codeql.rust.internal.Type
-private import codeql.rust.internal.TypeMention
-private import codeql.rust.internal.TypeInference
+private import Type
+private import TypeMention
+private import TypeInference
 
 /**
  * Holds if `traitBound` is the first non-trivial trait bound of `tp`.
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll b/rust/ql/lib/codeql/rust/internal/typeinference/DerefChain.qll
@@ -2,9 +2,9 @@
 
 private import rust
 private import codeql.rust.internal.PathResolution
-private import codeql.rust.internal.Type
-private import codeql.rust.internal.TypeInference
-private import codeql.rust.internal.TypeMention
+private import Type
+private import TypeInference
+private import codeql.rust.internal.typeinference.TypeMention
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 private import codeql.util.UnboundList as UnboundListImpl
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
@@ -7,9 +7,9 @@
 
 private import rust
 private import codeql.rust.internal.PathResolution
-private import codeql.rust.internal.Type
-private import codeql.rust.internal.TypeMention
-private import codeql.rust.internal.TypeInference
+private import Type
+private import TypeMention
+private import TypeInference
 private import FunctionType
 
 pragma[nomagic]
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
@@ -1,8 +1,8 @@
 private import rust
-private import codeql.rust.internal.TypeInference
 private import codeql.rust.internal.PathResolution
-private import codeql.rust.internal.Type
-private import codeql.rust.internal.TypeMention
+private import TypeInference
+private import Type
+private import TypeMention
 
 private newtype TFunctionPosition =
   TArgumentFunctionPosition(ArgumentPosition pos) or
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll b/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
@@ -1,7 +1,7 @@
 /** Provides classes representing types without type arguments. */
 
 private import rust
-private import PathResolution
+private import codeql.rust.internal.PathResolution
 private import TypeMention
 private import codeql.rust.internal.CachedStages
 private import codeql.rust.elements.internal.generated.Raw
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
@@ -3,14 +3,14 @@
 private import codeql.util.Boolean
 private import codeql.util.Option
 private import rust
-private import PathResolution
+private import codeql.rust.internal.PathResolution
 private import Type
 private import Type as T
 private import TypeMention
-private import typeinference.DerefChain
-private import typeinference.FunctionType
-private import typeinference.FunctionOverloading as FunctionOverloading
-private import typeinference.BlanketImplementation as BlanketImplementation
+private import codeql.rust.internal.typeinference.DerefChain
+private import FunctionType
+private import FunctionOverloading as FunctionOverloading
+private import BlanketImplementation as BlanketImplementation
 private import codeql.rust.elements.internal.VariableImpl::Impl as VariableImpl
 private import codeql.rust.internal.CachedStages
 private import codeql.typeinference.internal.TypeInference
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInferenceConsistency.qll
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
@@ -1,9 +1,9 @@
 /** Provides classes for representing type mentions, used in type inference. */
 
 private import rust
+private import codeql.rust.internal.PathResolution
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import Type
-private import PathResolution
 private import TypeInference
 
 /** An AST node that may mention a type. */
diff --git a/rust/ql/lib/codeql/rust/security/AccessAfterLifetimeExtensions.qll b/rust/ql/lib/codeql/rust/security/AccessAfterLifetimeExtensions.qll
@@ -6,8 +6,8 @@
 import rust
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.security.AccessInvalidPointerExtensions
-private import codeql.rust.internal.Type
-private import codeql.rust.internal.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.Type
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
 
 /**
  * Provides default sources, sinks and barriers for detecting accesses to a
diff --git a/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll b/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll
@@ -10,8 +10,8 @@ private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.internal.Node
 private import codeql.rust.security.Barriers as Barriers
-private import codeql.rust.internal.TypeInference as TypeInference
-private import codeql.rust.internal.Type
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.Type
 
 /**
  * Provides default sources, sinks and barriers for detecting accesses to
diff --git a/rust/ql/lib/codeql/rust/security/Barriers.qll b/rust/ql/lib/codeql/rust/security/Barriers.qll
@@ -5,8 +5,8 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
-private import codeql.rust.internal.TypeInference as TypeInference
-private import codeql.rust.internal.Type
+private import codeql.rust.internal.typeinference.TypeInference as TypeInference
+private import codeql.rust.internal.typeinference.Type
 private import codeql.rust.controlflow.ControlFlowGraph as Cfg
 private import codeql.rust.controlflow.CfgNodes as CfgNodes
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
diff --git a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
@@ -4,7 +4,7 @@
 
 private import rust
 private import codeql.rust.internal.PathResolution
-private import codeql.rust.internal.TypeInference
+private import codeql.rust.internal.typeinference.TypeInference
 private import utils.test.InlineExpectationsTest
 
 private module ResolveTest implements TestSig {
diff --git a/rust/ql/src/queries/diagnostics/TypeInferenceConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/TypeInferenceConsistencyCounts.ql
@@ -5,7 +5,7 @@
  * @id rust/diagnostics/type-inference-consistency-counts
  */
 
-private import codeql.rust.internal.TypeInferenceConsistency as Consistency
+private import codeql.rust.internal.typeinference.TypeInferenceConsistency as Consistency
 
 // see also `rust/diagnostics/type-inference-consistency`, which lists the
 // individual inconsistency results.
diff --git a/rust/ql/src/queries/summary/NodesWithTypeAtLengthLimit.ql b/rust/ql/src/queries/summary/NodesWithTypeAtLengthLimit.ql
@@ -7,7 +7,7 @@
  */
 
 import rust
-import codeql.rust.internal.TypeInference
+import codeql.rust.internal.typeinference.TypeInference
 
 from int atLimit
 where
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
@@ -8,7 +8,7 @@ private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
 private import codeql.rust.internal.AstConsistency as AstConsistency
 private import codeql.rust.internal.PathResolutionConsistency as PathResolutionConsistency
-private import codeql.rust.internal.TypeInferenceConsistency as TypeInferenceConsistency
+private import codeql.rust.internal.typeinference.TypeInferenceConsistency as TypeInferenceConsistency
 private import codeql.rust.controlflow.internal.CfgConsistency as CfgConsistency
 private import codeql.rust.dataflow.internal.DataFlowConsistency as DataFlowConsistency
 private import codeql.rust.dataflow.internal.SsaImpl::Consistency as SsaConsistency
diff --git a/rust/ql/src/queries/telemetry/DatabaseQuality.qll b/rust/ql/src/queries/telemetry/DatabaseQuality.qll
@@ -7,8 +7,8 @@
 import rust
 import codeql.util.ReportStats
 import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
-import codeql.rust.internal.TypeInference as TypeInference
-import codeql.rust.internal.Type
+import codeql.rust.internal.typeinference.TypeInference as TypeInference
+import codeql.rust.internal.typeinference.Type
 
 /**
  * A file that is included in the quality statistics.
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.ql b/rust/ql/test/library-tests/type-inference/type-inference.ql
@@ -1,7 +1,7 @@
 import rust
 import utils.test.InlineExpectationsTest
-import codeql.rust.internal.Type
-import codeql.rust.internal.TypeInference as TypeInference
+import codeql.rust.internal.typeinference.Type
+import codeql.rust.internal.typeinference.TypeInference as TypeInference
 import TypeInference
 
 private predicate relevantNode(AstNode n) {
