From b9a132dac66c5f45f2851b1d96c18fff3469fc2f Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Wed, 29 Apr 2026 15:35:27 +0100
Subject: [PATCH 1/3] Rust: Remove redundant cast.

---
 rust/ql/lib/codeql/rust/security/SensitiveData.qll | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust/ql/lib/codeql/rust/security/SensitiveData.qll b/rust/ql/lib/codeql/rust/security/SensitiveData.qll
index c4cd7c31366..c00d50ac590 100644
--- 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)
   }
 

From 20b4cbe72e9b7d8742aa4167304c0ec554a6e415 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 25 Jun 2026 12:46:35 +0100
Subject: [PATCH 2/3] Rust: Remove pointless imports of codeql.util.Unit.

---
 rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll | 1 -
 rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll | 1 -
 rust/ql/lib/codeql/rust/security/XssExtensions.qll          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
index 40d11362355..e1fe3711ba6 100644
--- 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/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
index de2622974f6..8c18760820e 100644
--- 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/XssExtensions.qll b/rust/ql/lib/codeql/rust/security/XssExtensions.qll
index 74ed161acb0..0920b88b3c3 100644
--- 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
 
 /**

From ca093273844a195a851abd886111de5544f6b868 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 25 Jun 2026 13:03:46 +0100
Subject: [PATCH 3/3] Rust: Remove more pointless imports.

---
 rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
index 2bd009909f6..081afa0ff23 100644
--- 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