Rust: Simplify accessDeclarationPositionMatch

paldepind · paldepind · commit 03c9a78bfb4c · 2025-06-12T11:16:29.000+02:00
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -672,13 +672,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
`@@ -672,13 +672,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {`
`672`	`672`	`}`
`673`	`673`
`674`	`674`	`predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {`
`675`		`- apos.isSelf() and`
`676`		`- dpos.isSelf()`
`677`		`- or`
`678`		`- apos.asPosition() = dpos.asPosition()`
`679`		`- or`
`680`		`- apos.isReturn() and`
`681`		`- dpos.isReturn()`
	`675`	`+ apos = dpos`
`682`	`676`	`}`
`683`	`677`
`684`	`678`	`bindingset[apos, target, path, t]`