Merge pull request #22056 from geoffw0/codequal

geoffw0 · web-flow · commit 0fbab225ce44 · 2026-06-25T15:52:15.000+01:00
Rust: Remove some redundant imports / casts
diff --git a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
@@ -8,7 +8,6 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
-private import codeql.util.Unit
 private import codeql.rust.security.Barriers as Barriers
 
 /**
diff --git a/rust/ql/lib/codeql/rust/security/SensitiveData.qll b/rust/ql/lib/codeql/rust/security/SensitiveData.qll
@@ -53,7 +53,6 @@ private class SensitiveVariableAccess extends SensitiveData {
     HeuristicNames::nameIndicatesSensitiveData(this.asExpr()
           .(VariableAccess)
           .getVariable()
-          .(Variable)
           .getText(), classification)
   }
 
diff --git a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
@@ -9,7 +9,6 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
-private import codeql.util.Unit
 private import codeql.rust.security.Barriers as Barriers
 
 /**
diff --git a/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
@@ -1,13 +1,9 @@
 /** Provides classes and predicates to reason about path injection vulnerabilities. */
 
 import rust
-private import codeql.rust.controlflow.BasicBlocks
-private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.dataflow.DataFlow
-private import codeql.rust.dataflow.TaintTracking
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.internal.DataFlowImpl
-private import codeql.rust.controlflow.ControlFlowGraph as Cfg
 
 /**
  * Provides default sources, sinks and barriers for detecting path injection
diff --git a/rust/ql/lib/codeql/rust/security/XssExtensions.qll b/rust/ql/lib/codeql/rust/security/XssExtensions.qll
@@ -8,7 +8,6 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
-private import codeql.util.Unit
 private import codeql.rust.security.Barriers as Barriers
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ private class SensitiveVariableAccess extends SensitiveData {`
`53`	`53`	`HeuristicNames::nameIndicatesSensitiveData(this.asExpr()`
`54`	`54`	`.(VariableAccess)`
`55`	`55`	`.getVariable()`
`56`		`- .(Variable)`
`57`	`56`	`.getText(), classification)`
`58`	`57`	`}`
`59`	`58`