Rust: Refactor using shared constraint satisfaction #20682
Conversation
paldepind
force-pushed
the
rust/ti-condition
branch
from
eb1e8b1 to
04b0ed6
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the AssocFunctionType implementation in Rust type inference to reuse constraint satisfaction functionality from the shared library. The main change simplifies the handling of specialized function types for traits and impl blocks by leveraging existing BaseTypes utilities instead of custom recursive logic.
Key Changes:
- Refactored
AssocFunctionTypefrom a union type with inheritance logic to a simpler single constructor with a helper predicate - Replaced custom type parameter resolution with shared library's
BaseTypes::conditionSatisfiesConstraintTypeAt - Updated all call sites to match the new signature ordering
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| shared/typeinference/codeql/typeinference/internal/TypeInference.qll | Exposed BaseTypes module by changing from private to public visibility |
| rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll | Major refactor of AssocFunctionType to use shared library constraint satisfaction logic |
| rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll | Updated calls to assocFunctionTypeAt to match new return value instead of out parameter |
| rust/ql/lib/codeql/rust/internal/TypeInference.qll | Updated calls to appliesTo to match new parameter ordering |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| pragma[nomagic] | ||
| private predicate hasSelfTypeParameterAt(TypePath path) { | ||
| this.getTypeParameterAt(path) = TSelfTypeParameter(_) | ||
| predicate appliesTo(Function f, ImplOrTraitItemNode i, FunctionPosition pos) { |
There was a problem hiding this comment.
I changed the parameter order here to match assocFunctionTypeAt.
paldepind
changed the title
|
|
||
| /** Provides logic related to base types. */ | ||
| private module BaseTypes { | ||
| module BaseTypes { |
There was a problem hiding this comment.
Making BaseTypes public was the simples way to get the needed predicates. We could also more surgically export the needed functions, but I'm not sure if that's worth the trouble.
| * `pos` at path `path` | ||
| */ | ||
| pragma[nomagic] | ||
| Type assocFunctionTypeAt(Function f, ImplOrTraitItemNode i, FunctionPosition pos, TypePath path) { |
There was a problem hiding this comment.
I think getAssocFunctionTypeAt would be a better name.
There was a problem hiding this comment.
This remains to be addressed.
| } | ||
|
|
||
| bindingset[condition, constraint, tp] | ||
| private Type traitConstraintTypeAt( |
There was a problem hiding this comment.
I still think this is a better name.
rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
Outdated
Show resolved
Hide resolved
paldepind
force-pushed
the
rust/ti-condition
branch
from
3ceb033 to
15bdb53
Compare
| } | ||
|
|
||
| bindingset[condition, constraint, tp] | ||
| private Type traitConstraintTypeAt( |
There was a problem hiding this comment.
I still think this is a better name.
| * `pos` at path `path` | ||
| */ | ||
| pragma[nomagic] | ||
| Type assocFunctionTypeAt(Function f, ImplOrTraitItemNode i, FunctionPosition pos, TypePath path) { |
There was a problem hiding this comment.
This remains to be addressed.
paldepind
force-pushed
the
rust/ti-condition
branch
from
15bdb53 to
d50d6c7
Compare
paldepind
force-pushed
the
rust/ti-condition
branch
from
d50d6c7 to
c648aa6
Compare
2 participants
Some of the code for
AssocFunctionTypereminded me a bit of what we have for constraint satisfaction in the shared library. This PR is a small refactor to reuse that functionality.