fix: resolve inferred type params when inlining trait method calls#21864
Open
Albab-Hasan wants to merge 2 commits intorust-lang:masterfrom
Open
fix: resolve inferred type params when inlining trait method calls#21864Albab-Hasan wants to merge 2 commits intorust-lang:masterfrom
Albab-Hasan wants to merge 2 commits intorust-lang:masterfrom
Conversation
When inlining a method call like `expr.into()`, the inline assist produced `U::from(expr)` where `U` is the unresolved type parameter name from the trait definition. This happened because PathTransform was only applied when explicit generic args (turbofish) were present, and even then only handled the function's own type params, not the containing trait/impl's params. The fix resolves inferred generic substitutions from the method call site using `resolve_method_call_fallback` and applies them to the inlined body via a new `PathTransform::with_type_substs()` builder, correctly replacing trait-level type parameters with concrete types. Also improves PathTransform to avoid unnecessary `<>` wrapping when substituting a type parameter used as a path qualifier with a simple path type (e.g. `T::method()` becomes `Foo::method()` instead of `<Foo>::method()`). Closes rust-lang#21601
d7e43cb to
b02752a
Compare
Collaborator
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
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.
when inlining a method call like
expr.into()the inline assist producedU::from(expr). this happened because PathTransform was only applied when explicit generic args (turbofish) were present and even then only handled the functions own type params not the containing trait/impl's params.the fix resolves inferred generic substitutions from the method call site using
resolve_method_call_fallbackand applies them to the inlined body via a newPathTransform::with_type_substs()builder correctly replacing trait level type parameters with concrete types.also improves PathTransform to avoid unnecessary
<>wrapping when substituting a type parameter used as a path qualifier with a simple path type (e.g.T::method()becomesFoo::method()instead of<Foo>::method()).closes #21601