Skip to content

Commit 93ee07c

Browse files
compiler-errorscompiler-errors
committed
Check that alias-relate terms are WF if reporting an error in alias-relate
1 parent 921645c commit 93ee07c

File tree

11 files changed

+43
-167
lines changed

11 files changed

+43
-167
lines changed

‎compiler/rustc_trait_selection/src/solve/fulfill.rs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,30 @@ impl<'tcx> ProofTreeVisitor<'tcx> for BestObligation<'tcx> {
515515
self.with_derived_obligation(obligation, |this| nested_goal.visit_with(this))?;
516516
}
517517

518+
// alias-relate may fail because the lhs or rhs can't be normalized,
519+
// and therefore is treated as rigid.
520+
if let Some(ty::PredicateKind::AliasRelate(lhs, rhs, _)) = pred_kind.no_bound_vars() {
521+
if let Some(obligation) = goal
522+
.infcx()
523+
.visit_proof_tree(
524+
goal.goal().with(goal.infcx().tcx, ty::ClauseKind::WellFormed(lhs.into())),
525+
self,
526+
)
527+
.break_value()
528+
{
529+
return ControlFlow::Break(obligation);
530+
} else if let Some(obligation) = goal
531+
.infcx()
532+
.visit_proof_tree(
533+
goal.goal().with(goal.infcx().tcx, ty::ClauseKind::WellFormed(rhs.into())),
534+
self,
535+
)
536+
.break_value()
537+
{
538+
return ControlFlow::Break(obligation);
539+
}
540+
}
541+
518542
ControlFlow::Break(self.obligation.clone())
519543
}
520544
}

‎tests/ui/associated-types/defaults-unsound-62211-1.next.stderr‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,17 @@ help: consider further restricting `Self`
3131
LL | trait UncheckedCopy: Sized + AddAssign<&'static str> {
3232
| +++++++++++++++++++++++++
3333

34-
error[E0271]: type mismatch resolving `<Self as Deref>::Target == str`
35-
--> $DIR/defaults-unsound-62211-1.rs:24:96
36-
|
37-
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
38-
| ^^^^ types differ
39-
|
40-
note: required by a bound in `UncheckedCopy::Output`
41-
--> $DIR/defaults-unsound-62211-1.rs:24:31
42-
|
43-
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
44-
| ^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
45-
4634
error[E0277]: the trait bound `Self: Deref` is not satisfied
4735
--> $DIR/defaults-unsound-62211-1.rs:24:96
4836
|
4937
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
5038
| ^^^^ the trait `Deref` is not implemented for `Self`
5139
|
5240
note: required by a bound in `UncheckedCopy::Output`
53-
--> $DIR/defaults-unsound-62211-1.rs:24:25
41+
--> $DIR/defaults-unsound-62211-1.rs:24:31
5442
|
5543
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
56-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
44+
| ^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
5745
help: consider further restricting `Self`
5846
|
5947
LL | trait UncheckedCopy: Sized + Deref {
@@ -75,7 +63,6 @@ help: consider further restricting `Self`
7563
LL | trait UncheckedCopy: Sized + Copy {
7664
| ++++++
7765

78-
error: aborting due to 5 previous errors
66+
error: aborting due to 4 previous errors
7967

80-
Some errors have detailed explanations: E0271, E0277.
81-
For more information about an error, try `rustc --explain E0271`.
68+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/associated-types/defaults-unsound-62211-1.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ trait UncheckedCopy: Sized {
2626
//~| ERROR the trait bound `Self: Deref` is not satisfied
2727
//~| ERROR cannot add-assign `&'static str` to `Self`
2828
//~| ERROR `Self` doesn't implement `std::fmt::Display`
29-
//[next]~| ERROR type mismatch resolving `<Self as Deref>::Target == str`
3029

3130
// We said the Output type was Copy, so we can Copy it freely!
3231
fn unchecked_copy(other: &Self::Output) -> Self::Output {

‎tests/ui/associated-types/defaults-unsound-62211-2.next.stderr‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,17 @@ help: consider further restricting `Self`
3131
LL | trait UncheckedCopy: Sized + AddAssign<&'static str> {
3232
| +++++++++++++++++++++++++
3333

34-
error[E0271]: type mismatch resolving `<Self as Deref>::Target == str`
35-
--> $DIR/defaults-unsound-62211-2.rs:24:96
36-
|
37-
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
38-
| ^^^^ types differ
39-
|
40-
note: required by a bound in `UncheckedCopy::Output`
41-
--> $DIR/defaults-unsound-62211-2.rs:24:31
42-
|
43-
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
44-
| ^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
45-
4634
error[E0277]: the trait bound `Self: Deref` is not satisfied
4735
--> $DIR/defaults-unsound-62211-2.rs:24:96
4836
|
4937
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
5038
| ^^^^ the trait `Deref` is not implemented for `Self`
5139
|
5240
note: required by a bound in `UncheckedCopy::Output`
53-
--> $DIR/defaults-unsound-62211-2.rs:24:25
41+
--> $DIR/defaults-unsound-62211-2.rs:24:31
5442
|
5543
LL | type Output: Copy + Deref<Target = str> + AddAssign<&'static str> + From<Self> + Display = Self;
56-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
44+
| ^^^^^^^^^^^^ required by this bound in `UncheckedCopy::Output`
5745
help: consider further restricting `Self`
5846
|
5947
LL | trait UncheckedCopy: Sized + Deref {
@@ -75,7 +63,6 @@ help: consider further restricting `Self`
7563
LL | trait UncheckedCopy: Sized + Copy {
7664
| ++++++
7765

78-
error: aborting due to 5 previous errors
66+
error: aborting due to 4 previous errors
7967

80-
Some errors have detailed explanations: E0271, E0277.
81-
For more information about an error, try `rustc --explain E0271`.
68+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/associated-types/defaults-unsound-62211-2.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ trait UncheckedCopy: Sized {
2626
//~| ERROR the trait bound `Self: Deref` is not satisfied
2727
//~| ERROR cannot add-assign `&'static str` to `Self`
2828
//~| ERROR `Self` doesn't implement `std::fmt::Display`
29-
//[next]~| ERROR type mismatch resolving `<Self as Deref>::Target == str`
3029

3130
// We said the Output type was Copy, so we can Copy it freely!
3231
fn unchecked_copy(other: &Self::Output) -> Self::Output {

‎tests/ui/associated-types/issue-54108.next.stderr‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
error[E0271]: type mismatch resolving `<<T as SubEncoder>::ActualSize as Add>::Output == <T as SubEncoder>::ActualSize`
2-
--> $DIR/issue-54108.rs:23:17
3-
|
4-
LL | type Size = <Self as SubEncoder>::ActualSize;
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ
6-
|
7-
note: required by a bound in `Encoder::Size`
8-
--> $DIR/issue-54108.rs:8:20
9-
|
10-
LL | type Size: Add<Output = Self::Size>;
11-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `Encoder::Size`
12-
131
error[E0277]: cannot add `<T as SubEncoder>::ActualSize` to `<T as SubEncoder>::ActualSize`
142
--> $DIR/issue-54108.rs:23:17
153
|
@@ -18,16 +6,15 @@ LL | type Size = <Self as SubEncoder>::ActualSize;
186
|
197
= help: the trait `Add` is not implemented for `<T as SubEncoder>::ActualSize`
208
note: required by a bound in `Encoder::Size`
21-
--> $DIR/issue-54108.rs:8:16
9+
--> $DIR/issue-54108.rs:8:20
2210
|
2311
LL | type Size: Add<Output = Self::Size>;
24-
| ^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Encoder::Size`
12+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `Encoder::Size`
2513
help: consider further restricting the associated type
2614
|
2715
LL | T: SubEncoder, <T as SubEncoder>::ActualSize: Add
2816
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2917

30-
error: aborting due to 2 previous errors
18+
error: aborting due to 1 previous error
3119

32-
Some errors have detailed explanations: E0271, E0277.
33-
For more information about an error, try `rustc --explain E0271`.
20+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/associated-types/issue-54108.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ where
2222
{
2323
type Size = <Self as SubEncoder>::ActualSize;
2424
//~^ ERROR: cannot add `<T as SubEncoder>::ActualSize` to `<T as SubEncoder>::ActualSize`
25-
//[next]~| ERROR type mismatch resolving `<<T as SubEncoder>::ActualSize as Add>::Output == <T as SubEncoder>::ActualSize`
2625

2726
fn foo(&self) -> Self::Size {
2827
self.bar() + self.bar()

‎tests/ui/traits/next-solver/coroutine.fail.stderr‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ LL | needs_coroutine(
66
LL | #[coroutine]
77
LL | / || {
88
LL | |
9-
LL | |
10-
LL | |
119
LL | | yield ();
1210
LL | | },
1311
| |_________^ the trait `Coroutine<A>` is not implemented for `{coroutine@$DIR/coroutine.rs:20:9: 20:11}`
@@ -18,47 +16,6 @@ note: required by a bound in `needs_coroutine`
1816
LL | fn needs_coroutine(_: impl Coroutine<A, Yield = B, Return = C>) {}
1917
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `needs_coroutine`
2018

21-
error[E0271]: type mismatch resolving `<{coroutine@$DIR/coroutine.rs:20:9: 20:11} as Coroutine<A>>::Yield == B`
22-
--> $DIR/coroutine.rs:20:9
23-
|
24-
LL | needs_coroutine(
25-
| --------------- required by a bound introduced by this call
26-
LL | #[coroutine]
27-
LL | / || {
28-
LL | |
29-
LL | |
30-
LL | |
31-
LL | | yield ();
32-
LL | | },
33-
| |_________^ types differ
34-
|
35-
note: required by a bound in `needs_coroutine`
36-
--> $DIR/coroutine.rs:14:41
37-
|
38-
LL | fn needs_coroutine(_: impl Coroutine<A, Yield = B, Return = C>) {}
39-
| ^^^^^^^^^ required by this bound in `needs_coroutine`
40-
41-
error[E0271]: type mismatch resolving `<{coroutine@$DIR/coroutine.rs:20:9: 20:11} as Coroutine<A>>::Return == C`
42-
--> $DIR/coroutine.rs:20:9
43-
|
44-
LL | needs_coroutine(
45-
| --------------- required by a bound introduced by this call
46-
LL | #[coroutine]
47-
LL | / || {
48-
LL | |
49-
LL | |
50-
LL | |
51-
LL | | yield ();
52-
LL | | },
53-
| |_________^ types differ
54-
|
55-
note: required by a bound in `needs_coroutine`
56-
--> $DIR/coroutine.rs:14:52
57-
|
58-
LL | fn needs_coroutine(_: impl Coroutine<A, Yield = B, Return = C>) {}
59-
| ^^^^^^^^^^ required by this bound in `needs_coroutine`
60-
61-
error: aborting due to 3 previous errors
19+
error: aborting due to 1 previous error
6220

63-
Some errors have detailed explanations: E0271, E0277.
64-
For more information about an error, try `rustc --explain E0271`.
21+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/traits/next-solver/coroutine.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ fn main() {
1919
#[coroutine]
2020
|| {
2121
//[fail]~^ ERROR Coroutine<A>` is not satisfied
22-
//[fail]~| ERROR as Coroutine<A>>::Yield == B`
23-
//[fail]~| ERROR as Coroutine<A>>::Return == C`
2422
yield ();
2523
},
2624
);

‎tests/ui/traits/next-solver/fn-trait.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ fn main() {
1919
require_fn(f as fn() -> i32);
2020
require_fn(f as unsafe fn() -> i32);
2121
//~^ ERROR: expected a `Fn()` closure, found `unsafe fn() -> i32`
22-
//~| ERROR: type mismatch resolving `<unsafe fn() -> i32 as FnOnce<()>>::Output == i32`
2322
require_fn(g);
2423
//~^ ERROR: expected a `Fn()` closure, found `extern "C" fn() -> i32 {g}`
25-
//~| ERROR: type mismatch resolving `<extern "C" fn() -> i32 {g} as FnOnce<()>>::Output == i32`
2624
require_fn(g as extern "C" fn() -> i32);
2725
//~^ ERROR: expected a `Fn()` closure, found `extern "C" fn() -> i32`
28-
//~| ERROR: type mismatch resolving `<extern "C" fn() -> i32 as FnOnce<()>>::Output == i32`
2926
require_fn(h);
3027
//~^ ERROR: expected a `Fn()` closure, found `unsafe fn() -> i32 {h}`
31-
//~| ERROR: type mismatch resolving `<unsafe fn() -> i32 {h} as FnOnce<()>>::Output == i32`
3228
}

0 commit comments

Comments
 (0)