Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure we note ambiguity causes on positive/negative impl conflicts #134639

Merged
merged 1 commit into from
Dec 22, 2024
+54 −9
Merged

Make sure we note ambiguity causes on positive/negative impl conflicts #134639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Make sure we note ambiguity causes on positive/negative impl conflicts
  • Loading branch information
@compiler-errors
compiler-errors committed Dec 22, 2024
commit 62d1f4faa172b409ea09a24acaf9dfccfd0c2710
22 changes: 13 additions & 9 deletions compiler/rustc_trait_selection/src/traits/specialize/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,15 +483,19 @@ fn report_negative_positive_conflict<'tcx>(
negative_impl_def_id: DefId,
positive_impl_def_id: DefId,
) -> ErrorGuaranteed {
tcx.dcx()
.create_err(NegativePositiveConflict {
impl_span: tcx.def_span(local_impl_def_id),
trait_desc: overlap.trait_ref,
self_ty: overlap.self_ty,
negative_impl_span: tcx.span_of_impl(negative_impl_def_id),
positive_impl_span: tcx.span_of_impl(positive_impl_def_id),
})
.emit()
let mut diag = tcx.dcx().create_err(NegativePositiveConflict {
impl_span: tcx.def_span(local_impl_def_id),
trait_desc: overlap.trait_ref,
self_ty: overlap.self_ty,
negative_impl_span: tcx.span_of_impl(negative_impl_def_id),
positive_impl_span: tcx.span_of_impl(positive_impl_def_id),
});

for cause in &overlap.intercrate_ambiguity_causes {
cause.add_intercrate_ambiguity_hint(&mut diag);
}

diag.emit()
}

fn report_conflicting_impls<'tcx>(
Expand Down
14 changes: 14 additions & 0 deletions tests/ui/traits/negative-impls/ambiguity-cause.negative_coherence.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error[E0119]: conflicting implementations of trait `MyTrait` for type `String`
--> $DIR/ambiguity-cause.rs:10:1
|
LL | impl<T: Copy> MyTrait for T { }
| --------------------------- first implementation here
LL |
LL | impl MyTrait for String { }
| ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `String`
|
= note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::string::String` in future versions
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this note^


error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0119`.
13 changes: 13 additions & 0 deletions tests/ui/traits/negative-impls/ambiguity-cause.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//@ revisions: simple negative_coherence

#![feature(negative_impls)]
#![cfg_attr(negative_coherence, feature(with_negative_coherence))]

trait MyTrait {}

impl<T: Copy> MyTrait for T { }

impl MyTrait for String { }
//~^ ERROR conflicting implementations of trait `MyTrait` for type `String`

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/traits/negative-impls/ambiguity-cause.simple.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error[E0119]: conflicting implementations of trait `MyTrait` for type `String`
--> $DIR/ambiguity-cause.rs:10:1
|
LL | impl<T: Copy> MyTrait for T { }
| --------------------------- first implementation here
LL |
LL | impl MyTrait for String { }
| ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `String`
|
= note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::string::String` in future versions

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0119`.
Loading