Modify existing bounds if they exist #107555
Merged
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Feb 4, 2023
Comment on lines
90
to
93
| .map(|id| (id, hir.local_def_id_to_hir_id(id))) | ||
| .and_then(|(local_id, hir_id)| tcx.hir().find_parent(hir_id).map(|node| (local_id, node))); | ||
| if let Some((local_id, generics)) = parent.as_ref() | ||
| .and_then(|(local_id, node)| node.generics().map(|generics| (local_id, generics))) |
There was a problem hiding this comment.
There's gotta be a way to simplify this, perhaps by avoiding these combinators... Could you maybe make this logic a bit simpler?
There was a problem hiding this comment.
Couldn't get rid of an and_then, but does this look cleaner to you?
edward-shen
force-pushed
the
edward-shen/dup-trait-suggestion
branch
from
7dad185 to
6dc7d7a
Compare
compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
Outdated
Show resolved
Hide resolved
compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
Outdated
Show resolved
Hide resolved
compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
Outdated
Show resolved
Hide resolved
Comment on lines
116
to
121
| .filter_map(|bound| { | ||
| let bound_trait_path = bound.trait_ref()?.path; | ||
| let def_id = bound_trait_path.res.opt_def_id()?; | ||
| let generic_args = bound_trait_path.segments.iter().last().map(|path| path.args()); | ||
| (def_id == trait_ref.def_id).then_some((bound_trait_path.span, generic_args)) | ||
| }) |
There was a problem hiding this comment.
What happens if we have like...
T: Trait<A> + Trait<B>
and then we suggest to restrict T: Trait<B, Output = C>
What will that do?
There was a problem hiding this comment.
Wouldn't the associated type prevent multiple trait impls on the same type anyways? So Trait<A> + Trait<B> would error for other reasons before suggesting to constrain the bounds?
There was a problem hiding this comment.
e.g.
trait Foo<T> {
type Output;
fn bar() -> Self::Output;
}
fn test<T>() -> i32 where T: Foo<()>, T: Foo<i32> {
<T as Foo<()>>::bar()
}
There was a problem hiding this comment.
But I guess that already suggests .. , Output = i32> correctly
edward-shen
force-pushed
the
edward-shen/dup-trait-suggestion
branch
from
6dc7d7a to
af5a37e
Compare
|
Changes:
|
|
Anywho @bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 6, 2023
…suggestion, r=compiler-errors Modify existing bounds if they exist Fixes rust-lang#107335. This implementation is kinda gross but I don't really see a better way to do it. This primarily does two things: Modifies `suggest_constraining_type_param` to accept a new parameter that indicates a span to be replaced instead of added, if presented, and limit the additive suggestions to either suggest a new bound on an existing bound (see newly added unit test) or add the generics argument if a generics argument wasn't found. The former change is required to retain the capability to add an entirely new bounds if it was entirely omitted. r? `@compiler-errors`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 7, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#100599 (Add compiler error E0523 long description and test) - rust-lang#107471 (rustdoc: do not include empty default-settings tag in HTML) - rust-lang#107555 (Modify existing bounds if they exist) - rust-lang#107662 (Turn projections into copies in CopyProp.) - rust-lang#107695 (Add test for Future inflating arg size to 3x ) - rust-lang#107700 (Run the tools builder on all PRs) - rust-lang#107706 (Mark 'atomic_mut_ptr' methods const) - rust-lang#107709 (Fix problem noticed in PR106859 with char -> u8 suggestion) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Fixes #107335.
This implementation is kinda gross but I don't really see a better way to do it.
This primarily does two things: Modifies
suggest_constraining_type_paramto accept a new parameter that indicates a span to be replaced instead of added, if presented, and limit the additive suggestions to either suggest a new bound on an existing bound (see newly added unit test) or add the generics argument if a generics argument wasn't found.The former change is required to retain the capability to add an entirely new bounds if it was entirely omitted.
r? @compiler-errors