Skip to content

Commit ad00868

Browse files
oli-obkoli-obk
committed
Revert "When checking whether an impl applies, constrain hidden types of opaque types."
This reverts commit 29a630e.
1 parent 8977f90 commit ad00868

25 files changed

+121
-172
lines changed

‎compiler/rustc_trait_selection/src/traits/select/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2563,7 +2563,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
25632563
let InferOk { obligations, .. } = self
25642564
.infcx
25652565
.at(&cause, obligation.param_env)
2566-
.eq(DefineOpaqueTypes::Yes, placeholder_obligation_trait_ref, impl_trait_ref)
2566+
.eq(DefineOpaqueTypes::No, placeholder_obligation_trait_ref, impl_trait_ref)
25672567
.map_err(|e| {
25682568
debug!("match_impl: failed eq_trait_refs due to `{}`", e.to_string(self.tcx()))
25692569
})?;

‎tests/ui/impl-trait/equality.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn sum_to(n: u32) -> impl Foo {
2222
0
2323
} else {
2424
n + sum_to(n - 1)
25-
//~^ ERROR cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
25+
//~^ ERROR cannot add `impl Foo` to `u32`
2626
}
2727
}
2828

@@ -32,15 +32,12 @@ trait Leak: Sized {
3232
}
3333
impl<T> Leak for T {
3434
default type T = ();
35-
default fn leak(self) -> Self::T {
36-
panic!()
37-
}
35+
default fn leak(self) -> Self::T { panic!() }
3836
}
3937
impl Leak for i32 {
4038
type T = i32;
41-
fn leak(self) -> i32 {
42-
self
43-
}
39+
fn leak(self) -> i32 { self }
4440
}
4541

46-
fn main() {}
42+
fn main() {
43+
}

‎tests/ui/impl-trait/equality.stderr

+11-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,20 @@ help: change the type of the numeric literal from `u32` to `i32`
2222
LL | 0_i32
2323
| ~~~
2424

25-
error[E0284]: type annotations needed: cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
25+
error[E0277]: cannot add `impl Foo` to `u32`
2626
--> $DIR/equality.rs:24:11
2727
|
2828
LL | n + sum_to(n - 1)
29-
| ^ cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
29+
| ^ no implementation for `u32 + impl Foo`
30+
|
31+
= help: the trait `Add<impl Foo>` is not implemented for `u32`
32+
= help: the following other types implement trait `Add<Rhs>`:
33+
<&'a u32 as Add<u32>>
34+
<&u32 as Add<&u32>>
35+
<u32 as Add<&u32>>
36+
<u32 as Add>
3037

3138
error: aborting due to 2 previous errors; 1 warning emitted
3239

33-
Some errors have detailed explanations: E0284, E0308.
34-
For more information about an error, try `rustc --explain E0284`.
40+
Some errors have detailed explanations: E0277, E0308.
41+
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/impl-trait/nested_impl_trait.stderr

+6-10
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,19 @@ error[E0277]: the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfie
4646
--> $DIR/nested_impl_trait.rs:6:46
4747
|
4848
LL | fn bad_in_ret_position(x: impl Into<u32>) -> impl Into<impl Debug> { x }
49-
| ^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for `impl Into<u32>`
49+
| ^^^^^^^^^^^^^^^^^^^^^ the trait `From<impl Into<u32>>` is not implemented for `impl Into<u32>`, which is required by `impl Into<u32>: Into<impl Debug>`
5050
|
51-
help: consider further restricting this bound
52-
|
53-
LL | fn bad_in_ret_position(x: impl Into<u32> + std::fmt::Debug) -> impl Into<impl Debug> { x }
54-
| +++++++++++++++++
51+
= help: the trait `Into<U>` is implemented for `T`
52+
= note: required for `impl Into<u32>` to implement `Into<impl Debug>`
5553

5654
error[E0277]: the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfied
5755
--> $DIR/nested_impl_trait.rs:19:34
5856
|
5957
LL | fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
60-
| ^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for `impl Into<u32>`
61-
|
62-
help: consider further restricting this bound
58+
| ^^^^^^^^^^^^^^^^^^^^^ the trait `From<impl Into<u32>>` is not implemented for `impl Into<u32>`, which is required by `impl Into<u32>: Into<impl Debug>`
6359
|
64-
LL | fn bad(x: impl Into<u32> + std::fmt::Debug) -> impl Into<impl Debug> { x }
65-
| +++++++++++++++++
60+
= help: the trait `Into<U>` is implemented for `T`
61+
= note: required for `impl Into<u32>` to implement `Into<impl Debug>`
6662

6763
error: aborting due to 7 previous errors
6864

‎tests/ui/impl-trait/recursive-bound-eval.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
//! Test that we can evaluate nested obligations when invoking methods on recursive calls on
2+
//! an RPIT.
3+
4+
//@ check-pass
5+
16
pub trait Parser<E> {
27
fn parse(&self) -> E;
38
}
@@ -9,10 +14,7 @@ impl<E, T: Fn() -> E> Parser<E> for T {
914
}
1015

1116
pub fn recursive_fn<E>() -> impl Parser<E> {
12-
//~^ ERROR: cycle detected
1317
move || recursive_fn().parse()
14-
//~^ ERROR: type annotations needed
15-
//~| ERROR: no method named `parse` found for opaque type
1618
}
1719

1820
fn main() {}

‎tests/ui/impl-trait/recursive-bound-eval.stderr

-42
This file was deleted.

‎tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl PartialEq<(Bar, i32)> for Bar {
1111
}
1212

1313
fn foo() -> Foo {
14-
//~^ ERROR overflow evaluating the requirement `Bar: PartialEq<(Foo, i32)>`
14+
//~^ ERROR can't compare `Bar` with `(Foo, i32)`
1515
Bar
1616
}
1717

‎tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.stderr

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
error[E0275]: overflow evaluating the requirement `Bar: PartialEq<(Foo, i32)>`
1+
error[E0277]: can't compare `Bar` with `(Foo, i32)`
22
--> $DIR/recursive-type-alias-impl-trait-declaration.rs:13:13
33
|
44
LL | fn foo() -> Foo {
5-
| ^^^
5+
| ^^^ no implementation for `Bar == (Foo, i32)`
6+
LL |
7+
LL | Bar
8+
| --- return type was inferred to be `Bar` here
9+
|
10+
= help: the trait `PartialEq<(Foo, i32)>` is not implemented for `Bar`
11+
= help: the trait `PartialEq<(Bar, i32)>` is implemented for `Bar`
612

713
error: aborting due to 1 previous error
814

9-
For more information about this error, try `rustc --explain E0275`.
15+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/type-alias-impl-trait/constrain_in_projection.current.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0277]: the trait bound `Foo: Trait<Bar>` is not satisfied
2+
--> $DIR/constrain_in_projection.rs:24:14
3+
|
4+
LL | let x = <Foo as Trait<Bar>>::Assoc::default();
5+
| ^^^ the trait `Trait<Bar>` is not implemented for `Foo`
6+
|
7+
= help: the trait `Trait<()>` is implemented for `Foo`
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/type-alias-impl-trait/constrain_in_projection.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@ revisions: current next
55
//@ ignore-compare-mode-next-solver (explicit revisions)
66
//@[next] compile-flags: -Znext-solver
7-
//@check-pass
7+
//@[next]check-pass
88

99
#![feature(type_alias_impl_trait)]
1010

@@ -22,6 +22,7 @@ impl Trait<()> for Foo {
2222

2323
fn bop(_: Bar) {
2424
let x = <Foo as Trait<Bar>>::Assoc::default();
25+
//[current]~^ `Foo: Trait<Bar>` is not satisfied
2526
}
2627

2728
fn main() {}

‎tests/ui/type-alias-impl-trait/constrain_in_projection2.current.stderr

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
error[E0283]: type annotations needed: cannot satisfy `Foo: Trait<Bar>`
1+
error[E0277]: the trait bound `Foo: Trait<Bar>` is not satisfied
22
--> $DIR/constrain_in_projection2.rs:27:14
33
|
44
LL | let x = <Foo as Trait<Bar>>::Assoc::default();
5-
| ^^^ help: use the fully qualified path to an implementation: `<Type as Trait>::Assoc`
5+
| ^^^ the trait `Trait<Bar>` is not implemented for `Foo`
66
|
7-
note: multiple `impl`s satisfying `Foo: Trait<Bar>` found
8-
--> $DIR/constrain_in_projection2.rs:18:1
9-
|
10-
LL | impl Trait<()> for Foo {
11-
| ^^^^^^^^^^^^^^^^^^^^^^
12-
...
13-
LL | impl Trait<u32> for Foo {
14-
| ^^^^^^^^^^^^^^^^^^^^^^^
15-
= note: associated types cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
7+
= help: the following other types implement trait `Trait<T>`:
8+
<Foo as Trait<()>>
9+
<Foo as Trait<u32>>
1610

1711
error: aborting due to 1 previous error
1812

19-
For more information about this error, try `rustc --explain E0283`.
13+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/type-alias-impl-trait/constrain_in_projection2.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ impl Trait<u32> for Foo {
2525

2626
fn bop(_: Bar) {
2727
let x = <Foo as Trait<Bar>>::Assoc::default();
28-
//~^ ERROR: cannot satisfy `Foo: Trait<Bar>`
28+
//[next]~^ ERROR: cannot satisfy `Foo: Trait<Bar>`
29+
//[current]~^^ ERROR: `Foo: Trait<Bar>` is not satisfied
2930
}
3031

3132
fn main() {}

‎tests/ui/type-alias-impl-trait/issue-84660-unsoundness.next.stderr

-23
This file was deleted.

‎tests/ui/type-alias-impl-trait/issue-84660-unsoundness.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// Another example from issue #84660, this time weaponized as a safe transmute: an opaque type in an
22
// impl header being accepted was used to create unsoundness.
33

4-
//@ revisions: current next
5-
//@ ignore-compare-mode-next-solver (explicit revisions)
6-
//@[next] compile-flags: -Znext-solver
7-
84
#![feature(type_alias_impl_trait)]
95

106
trait Foo {}
@@ -20,13 +16,11 @@ trait Trait<T, In> {
2016
impl<In, Out> Trait<Bar, In> for Out {
2117
type Out = Out;
2218
fn convert(_i: In) -> Self::Out {
23-
//[next]~^ ERROR: type annotations needed
2419
unreachable!();
2520
}
2621
}
2722

28-
impl<In, Out> Trait<(), In> for Out {
29-
//~^ ERROR conflicting implementations of trait `Trait<Bar, _>`
23+
impl<In, Out> Trait<(), In> for Out { //~ ERROR conflicting implementations of trait `Trait<Bar, _>`
3024
type Out = In;
3125
fn convert(i: In) -> Self::Out {
3226
i

‎tests/ui/type-alias-impl-trait/issue-84660-unsoundness.current.stderr ‎tests/ui/type-alias-impl-trait/issue-84660-unsoundness.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait<Bar, _>`
2-
--> $DIR/issue-84660-unsoundness.rs:28:1
2+
--> $DIR/issue-84660-unsoundness.rs:23:1
33
|
44
LL | impl<In, Out> Trait<Bar, In> for Out {
55
| ------------------------------------ first implementation here

‎tests/ui/type-alias-impl-trait/nested-tait-inference.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
#![feature(type_alias_impl_trait)]
22
#![allow(dead_code)]
33

4-
//@ revisions: current next
5-
//@ ignore-compare-mode-next-solver (explicit revisions)
6-
//@[next] compile-flags: -Znext-solver
7-
//@check-pass
8-
94
use std::fmt::Debug;
105

116
type FooX = impl Debug;
127

13-
trait Foo<A> {}
8+
trait Foo<A> { }
149

15-
impl Foo<()> for () {}
10+
impl Foo<()> for () { }
1611

1712
fn foo() -> impl Foo<FooX> {
13+
//~^ ERROR: the trait bound `(): Foo<FooX>` is not satisfied
14+
// FIXME(type-alias-impl-trait): We could probably make this work.
1815
()
1916
}
2017

21-
fn main() {}
18+
fn main() { }

‎tests/ui/type-alias-impl-trait/nested-tait-inference2.current.stderr

-17
This file was deleted.

‎tests/ui/type-alias-impl-trait/nested-tait-inference2.next.stderr

-9
This file was deleted.

‎tests/ui/type-alias-impl-trait/nested-tait-inference2.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#![feature(type_alias_impl_trait)]
22
#![allow(dead_code)]
33

4-
//@ revisions: current next
5-
//@ ignore-compare-mode-next-solver (explicit revisions)
6-
//@[next] compile-flags: -Znext-solver
7-
84
use std::fmt::Debug;
95

106
type FooX = impl Debug;
@@ -15,9 +11,8 @@ impl Foo<()> for () {}
1511
impl Foo<u32> for () {}
1612

1713
fn foo() -> impl Foo<FooX> {
18-
//[current]~^ ERROR: cannot satisfy `(): Foo<FooX>`
14+
//~^ ERROR: the trait bound `(): Foo<FooX>` is not satisfied
1915
()
20-
//[next]~^ ERROR: cannot satisfy `impl Foo<FooX> == ()`
2116
}
2217

2318
fn main() {}

‎tests/ui/type-alias-impl-trait/nested-tait-inference2.stderr

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
error[E0277]: the trait bound `(): Foo<FooX>` is not satisfied
2+
--> $DIR/nested-tait-inference2.rs:13:13
3+
|
4+
LL | fn foo() -> impl Foo<FooX> {
5+
| ^^^^^^^^^^^^^^ the trait `Foo<FooX>` is not implemented for `()`
6+
LL |
7+
LL | ()
8+
| -- return type was inferred to be `()` here
9+
|
10+
= help: the following other types implement trait `Foo<A>`:
11+
<() as Foo<()>>
12+
<() as Foo<u32>>
13+
14+
error: aborting due to 1 previous error
15+
16+
For more information about this error, try `rustc --explain E0277`.

0 commit comments

Comments
 (0)