Rust: Simplify accessDeclarationPositionMatch

paldepind · paldepind · commit 5bdf989facff · 2025-06-11T14:40:37.000+02:00
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -664,13 +664,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
   }
 
   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos.isSelf() and
-    dpos.isSelf()
-    or
-    apos.asPosition() = dpos.asPosition()
-    or
-    apos.isReturn() and
-    dpos.isReturn()
+    apos = dpos
   }
 
   bindingset[apos, target, path, t]

Original file line number	Diff line number	Diff line change
`@@ -664,13 +664,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {`
`667`		`- apos.isSelf() and`
`668`		`- dpos.isSelf()`
`669`		`- or`
`670`		`- apos.asPosition() = dpos.asPosition()`
`671`		`- or`
`672`		`- apos.isReturn() and`
`673`		`- dpos.isReturn()`
	`667`	`+ apos = dpos`
`674`	`668`	`}`
`675`	`669`
`676`	`670`	`bindingset[apos, target, path, t]`