hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 09:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17751 from paldepind/rust-rename-predicate

Browse Source 
Rust: Rename isIrrefutablePattern to isExhaustiveMatch
This commit is contained in:
Simon Friis Vindum
2024-10-14 14:47:15 +02:00
committed by GitHub
parent d0f978d937 22261c1480
commit ef1592fe32
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
View File

@@ -123,9 +123,9 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
override string toString() { result = "boolean(" + value + ")" }
}
/** Holds if `pat` is guaranteed to match. */
/** Holds if `pat` is guaranteed to match at the point in the AST where it occurs. */
pragma[nomagic]
private predicate isIrrefutablePattern(Pat pat) {
private predicate isExhaustiveMatch(Pat pat) {
(
pat instanceof WildcardPat
or
@@ -133,18 +133,18 @@ private predicate isIrrefutablePattern(Pat pat) {
or
pat instanceof RestPat
or
// `let` statements without an `else` branch must be irrefutible
// `let` statements without an `else` branch must be exhaustive
pat = any(LetStmt let | not let.hasLetElse()).getPat()
or
// `match` expressions must be irrefutible, so last arm cannot fail
// `match` expressions must be exhaustive, so last arm cannot fail
pat = any(MatchExpr me).getLastArm().getPat()
or
// parameter patterns must be irrefutible
// parameter patterns must be exhaustive
pat = any(Param p).getPat()
) and
not pat = any(ForExpr for).getPat() // workaround until `for` loops are desugared
or
exists(Pat parent | isIrrefutablePattern(parent) |
exists(Pat parent | isExhaustiveMatch(parent) |
pat = parent.(BoxPat).getPat()
or
pat = parent.(IdentPat).getPat()
@@ -171,7 +171,7 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
override predicate isValidForSpecific(AstNode e) {
e instanceof Pat and
if isIrrefutablePattern(e) then value = true else any()
if isExhaustiveMatch(e) then value = true else any()
}
override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }