Rust: Handle variables introduced in if-let guards#20765
Merged
hvitved merged 2 commits intogithub:mainfrom Nov 6, 2025
Merged
Rust: Handle variables introduced in if-let guards#20765hvitved merged 2 commits intogithub:mainfrom
hvitved merged 2 commits intogithub:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR improves the handling of variable scoping in match arm guards with nested let patterns in Rust. The key change refactors how variable scopes are managed for match arms to properly handle cases where variables declared in the match arm pattern can be shadowed within the guard expression itself.
Key changes:
- Refactored
MatchArmScopefrom an abstract class with two implementations into two separate scope classes - Introduced
ConditionScopefor match arm guards to properly handle variables declared in nestedletexpressions within guards - Updated the variable declaration logic to correctly determine variable scope and ordering for match arm patterns
Reviewed Changes
Copilot reviewed 4 out of 5 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| rust/ql/test/library-tests/variables/main.rs | Added test case match_pattern16() demonstrating variable shadowing in match arm guards with nested let patterns |
| rust/ql/test/library-tests/variables/variables.expected | Updated expected test results to include the new test case variables and their accesses |
| rust/ql/test/library-tests/variables/Ssa.expected | Updated SSA analysis expected results for the new test case |
| rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll | Refactored scope classes and variable declaration logic to properly handle match arm guard scoping |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
geoffw0
approved these changes
Nov 6, 2025
Contributor
geoffw0
left a comment
There was a problem hiding this comment.
Code changes LGTM.
The improvement to rust/unused-variable results is very welcome.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DCA is great: Improved performance on
rustand a lot ofrust/unused-variablefalse positives removed.