-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
if a trait is unknowable, but its super trait is definitely not implemented, then the trait itself is definitely also not implemented.
- Loading branch information
Showing
11 changed files
with
122 additions
and
2 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
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
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
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
13 changes: 13 additions & 0 deletions
13
tests/ui/coherence/super-traits/super-trait-knowable-1.current.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,13 @@ | ||
error[E0119]: conflicting implementations of trait `Overlap<_>` for type `()` | ||
--> $DIR/super-trait-knowable-1.rs:16:1 | ||
| | ||
LL | impl<T, U: Sub<T>> Overlap<T> for U {} | ||
| ----------------------------------- first implementation here | ||
LL | impl<T> Overlap<T> for () {} | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()` | ||
| | ||
= note: downstream crates may implement trait `Sub<_>` for type `()` | ||
|
||
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,19 @@ | ||
// Added in #124532. While `(): Super` is knowable, `(): Sub<?t>` is not. | ||
// | ||
// We therefore elaborate super trait bounds in the implicit negative | ||
// overlap check. | ||
|
||
//@ revisions: current next | ||
//@ ignore-compare-mode-next-solver (explicit revisions) | ||
//@[next] compile-flags: -Znext-solver | ||
//@[next] check-pass | ||
|
||
trait Super {} | ||
trait Sub<T>: Super {} | ||
|
||
trait Overlap<T> {} | ||
impl<T, U: Sub<T>> Overlap<T> for U {} | ||
impl<T> Overlap<T> for () {} | ||
//[current]~^ ERROR conflicting implementations | ||
|
||
fn main() {} |
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,33 @@ | ||
// A regression test for pyella-0.1.5 which broke when | ||
// enabling the new solver in coherence. | ||
// | ||
// `Tensor: TensorValue` is knowable while `Tensor: TensorOp<?t2>` | ||
// may be implemented downstream. We previously didn't check the | ||
// super trait bound in coherence, causing these impls to overlap. | ||
// | ||
// However, we did fail to normalize `<Tensor as TensorValue::Unmasked` | ||
// which caused the old solver to emit a `Tensor: TensorValue` goal in | ||
// `fn normalize_to_error` which then failed, causing this test to pass. | ||
|
||
//@ revisions: current next | ||
//@ ignore-compare-mode-next-solver (explicit revisions) | ||
//@[next] compile-flags: -Znext-solver | ||
//@ check-pass | ||
|
||
pub trait TensorValue { | ||
type Unmasked; | ||
} | ||
|
||
trait TensorCompare<T> {} | ||
pub trait TensorOp<T>: TensorValue {} | ||
|
||
pub struct Tensor; | ||
impl<T2> TensorCompare<T2> for Tensor {} | ||
impl<T1, T2> TensorCompare<T2> for T1 | ||
where | ||
T1: TensorOp<T2>, | ||
T1::Unmasked: Sized, | ||
{} | ||
|
||
|
||
fn main() {} |
13 changes: 13 additions & 0 deletions
13
tests/ui/coherence/super-traits/super-trait-knowable-3.current.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,13 @@ | ||
error[E0119]: conflicting implementations of trait `Overlap<_>` for type `()` | ||
--> $DIR/super-trait-knowable-3.rs:19:1 | ||
| | ||
LL | impl<T, U: Bound<W<T>>> Overlap<T> for U {} | ||
| ---------------------------------------- first implementation here | ||
LL | impl<T> Overlap<T> for () {} | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()` | ||
| | ||
= note: downstream crates may implement trait `Sub<_>` for type `()` | ||
|
||
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,22 @@ | ||
// Unlike in `super-trait-knowable-1.rs`, the knowable | ||
// super trait bound is in a nested goal so this would not | ||
// compile if we were to only elaborate root goals. | ||
|
||
//@ revisions: current next | ||
//@ ignore-compare-mode-next-solver (explicit revisions) | ||
//@[next] compile-flags: -Znext-solver | ||
//@[next] check-pass | ||
|
||
trait Super {} | ||
trait Sub<T>: Super {} | ||
|
||
struct W<T>(T); | ||
trait Bound<T> {} | ||
impl<T: Sub<U>, U> Bound<W<U>> for T {} | ||
|
||
trait Overlap<T> {} | ||
impl<T, U: Bound<W<T>>> Overlap<T> for U {} | ||
impl<T> Overlap<T> for () {} | ||
//[current]~^ ERROR conflicting implementations of trait `Overlap<_>` for type `()` | ||
|
||
fn main() {} |
2 changes: 1 addition & 1 deletion
2
tests/ui/issues/issue-48728.stderr → tests/ui/issues/issue-48728.current.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
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