forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#134639 - compiler-errors:negative-ambiguity…
…-causes, r=oli-obk Make sure we note ambiguity causes on positive/negative impl conflicts Fixes rust-lang#134632 by explaining why the error must be
- Loading branch information
Showing
4 changed files
with
54 additions
and
9 deletions.
There are no files selected for viewing
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
14 changes: 14 additions & 0 deletions
14
tests/ui/traits/negative-impls/ambiguity-cause.negative_coherence.stderr
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
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`. |
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
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
14
tests/ui/traits/negative-impls/ambiguity-cause.simple.stderr
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
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`. |