Skip to content

Commit d8596e1

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

31 files changed

+122
-162
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2543,7 +2543,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
25432543
let InferOk { obligations, .. } = self
25442544
.infcx
25452545
.at(&cause, obligation.param_env)
2546-
.eq(DefineOpaqueTypes::No, placeholder_obligation_trait_ref, impl_trait_ref)
2546+
.eq(DefineOpaqueTypes::Yes, placeholder_obligation_trait_ref, impl_trait_ref)
25472547
.map_err(|e| {
25482548
debug!("match_impl: failed eq_trait_refs due to `{}`", e.to_string(self.tcx()))
25492549
})?;

‎tests/ui/auto-traits/opaque_type_candidate_selection.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//! used to ICE: #119272
2+
3+
#![feature(type_alias_impl_trait)]
4+
mod defining_scope {
5+
use super::*;
6+
pub type Alias<T> = impl Sized;
7+
8+
pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
9+
x
10+
}
11+
}
12+
13+
struct Container<T: Trait<U>, U> {
14+
x: <T as Trait<U>>::Assoc,
15+
}
16+
17+
trait Trait<T> {
18+
type Assoc;
19+
}
20+
21+
impl<T> Trait<T> for T {
22+
type Assoc = Box<u32>;
23+
}
24+
impl<T> Trait<T> for defining_scope::Alias<T> {
25+
//~^ ERROR: conflicting implementations
26+
type Assoc = usize;
27+
}
28+
29+
fn main() {}

‎tests/ui/auto-traits/opaque_type_candidate_selection.stderr

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0119]: conflicting implementations of trait `Trait<_>`
2+
--> $DIR/opaque_type_candidate_selection.rs:24:1
3+
|
4+
LL | impl<T> Trait<T> for T {
5+
| ---------------------- first implementation here
6+
...
7+
LL | impl<T> Trait<T> for defining_scope::Alias<T> {
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
9+
10+
error: aborting due to 1 previous error
11+
12+
For more information about this error, try `rustc --explain E0119`.

‎tests/ui/impl-trait/call_method_on_inherent_impl_on_rigid_type.current.stderr

-16
This file was deleted.

‎tests/ui/impl-trait/call_method_on_inherent_impl_on_rigid_type.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0282]: type annotations needed for `&_`
2-
--> $DIR/call_method_on_inherent_impl_on_rigid_type.rs:14:13
2+
--> $DIR/call_method_on_inherent_impl_on_rigid_type.rs:15:13
33
|
44
LL | let x = &my_foo();
55
| ^

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ revisions: current next
22
//@[next] compile-flags: -Znext-solver
3+
//@[current] check-pass
34

45
trait MyDebug {
56
fn my_debug(&self);
@@ -14,7 +15,6 @@ fn my_foo() -> impl std::fmt::Debug {
1415
let x = &my_foo();
1516
//[next]~^ ERROR: type annotations needed
1617
x.my_debug();
17-
//[current]~^ ERROR: no method named `my_debug`
1818
}
1919
()
2020
}

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

+1-1
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 add `impl Foo` to `u32`
25+
//~^ ERROR cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
2626
}
2727
}
2828

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

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

25-
error[E0277]: cannot add `impl Foo` to `u32`
25+
error[E0284]: type annotations needed: cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
2626
--> $DIR/equality.rs:24:11
2727
|
2828
LL | n + sum_to(n - 1)
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-
`&u32` implements `Add<u32>`
34-
`&u32` implements `Add`
35-
`u32` implements `Add<&u32>`
36-
`u32` implements `Add`
29+
| ^ cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
3730

3831
error: aborting due to 2 previous errors; 1 warning emitted
3932

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fn fine(x: impl Into<u32>) -> impl Into<u32> { x }
55

66
fn bad_in_ret_position(x: impl Into<u32>) -> impl Into<impl Debug> { x }
77
//~^ ERROR nested `impl Trait` is not allowed
8-
//~| ERROR the trait bound `impl Debug: From<impl Into<u32>>` is not satisfied
8+
//~| ERROR the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfied
99

1010
fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
1111
//~^ ERROR nested `impl Trait` is not allowed
@@ -18,7 +18,7 @@ struct X;
1818
impl X {
1919
fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
2020
//~^ ERROR nested `impl Trait` is not allowed
21-
//~| ERROR the trait bound `impl Debug: From<impl Into<u32>>` is not satisfied
21+
//~| ERROR the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfied
2222
}
2323

2424
fn allowed_in_assoc_type() -> impl Iterator<Item=impl Fn()> {

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,27 @@ LL | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
4242
|
4343
= note: `impl Trait` is only allowed in arguments and return types of functions and methods
4444

45-
error[E0277]: the trait bound `impl Debug: From<impl Into<u32>>` is not satisfied
45+
error[E0277]: the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfied
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-
| ^^^^^^^^^^^^^^^^^^^^^ - return type was inferred to be `impl Into<u32>` here
50-
| |
51-
| the trait `From<impl Into<u32>>` is not implemented for `impl Debug`
49+
| ^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for `impl Into<u32>`
5250
|
53-
= help: the trait `Into<U>` is implemented for `T`
54-
= note: required for `impl Into<u32>` to implement `Into<impl Debug>`
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+
| +++++++++++++++++
5555

56-
error[E0277]: the trait bound `impl Debug: From<impl Into<u32>>` is not satisfied
56+
error[E0277]: the trait bound `impl Into<u32>: Into<impl Debug>` is not satisfied
5757
--> $DIR/nested_impl_trait.rs:19:34
5858
|
5959
LL | fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
60-
| ^^^^^^^^^^^^^^^^^^^^^ - return type was inferred to be `impl Into<u32>` here
61-
| |
62-
| the trait `From<impl Into<u32>>` is not implemented for `impl Debug`
60+
| ^^^^^^^^^^^^^^^^^^^^^ the trait `Debug` is not implemented for `impl Into<u32>`
61+
|
62+
help: consider further restricting this bound
6363
|
64-
= help: the trait `Into<U>` is implemented for `T`
65-
= note: required for `impl Into<u32>` to implement `Into<impl Debug>`
64+
LL | fn bad(x: impl Into<u32> + std::fmt::Debug) -> impl Into<impl Debug> { x }
65+
| +++++++++++++++++
6666

6767
error: aborting due to 7 previous errors
6868

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

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0282]: type annotations needed
2+
--> $DIR/recursive-bound-eval.rs:18:28
3+
|
4+
LL | move || recursive_fn().parse()
5+
| ^^^^^ cannot infer type
6+
7+
error: aborting due to 1 previous error
8+
9+
For more information about this error, try `rustc --explain E0282`.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0282]: type annotations needed
2-
--> $DIR/recursive-bound-eval.rs:20:13
2+
--> $DIR/recursive-bound-eval.rs:18:13
33
|
44
LL | move || recursive_fn().parse()
55
| ^^^^^^^^^^^^^^ cannot infer type

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
//@revisions: next current
55
//@[next] compile-flags: -Znext-solver
66

7-
//@[current] check-pass
8-
97
pub trait Parser<E> {
108
fn parse(&self) -> E;
119
}
@@ -18,7 +16,7 @@ impl<E, T: Fn() -> E> Parser<E> for T {
1816

1917
pub fn recursive_fn<E>() -> impl Parser<E> {
2018
move || recursive_fn().parse()
21-
//[next]~^ ERROR: type annotations needed
19+
//~^ ERROR: type annotations needed
2220
}
2321

2422
fn main() {}

‎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 can't compare `Bar` with `(Foo, i32)`
14+
//~^ ERROR overflow evaluating the requirement `Bar: PartialEq<(Foo, i32)>`
1515
Bar
1616
}
1717

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

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
error[E0277]: can't compare `Bar` with `(Foo, i32)`
1+
error[E0275]: overflow evaluating the requirement `Bar: PartialEq<(Foo, i32)>`
22
--> $DIR/recursive-type-alias-impl-trait-declaration.rs:13:13
33
|
44
LL | fn foo() -> Foo {
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`
5+
| ^^^
126

137
error: aborting due to 1 previous error
148

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

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

-12
This file was deleted.

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

+1-2
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-
//@[next]check-pass
7+
//@check-pass
88

99
#![feature(type_alias_impl_trait)]
1010

@@ -22,7 +22,6 @@ 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
2625
}
2726

2827
fn main() {}

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

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
error[E0277]: the trait bound `Foo: Trait<Bar>` is not satisfied
1+
error[E0283]: type annotations needed: cannot satisfy `Foo: Trait<Bar>`
22
--> $DIR/constrain_in_projection2.rs:27:14
33
|
44
LL | let x = <Foo as Trait<Bar>>::Assoc::default();
5-
| ^^^ the trait `Trait<Bar>` is not implemented for `Foo`
5+
| ^^^ help: use the fully qualified path to an implementation: `<Type as Trait>::Assoc`
66
|
7-
= help: the following other types implement trait `Trait<T>`:
8-
`Foo` implements `Trait<()>`
9-
`Foo` implements `Trait<u32>`
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`
1016

1117
error: aborting due to 1 previous error
1218

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

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

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

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

3231
fn main() {}

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

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
11
error[E0119]: conflicting implementations of trait `Trait<Bar, _>`
2-
--> $DIR/issue-84660-unsoundness.rs:29:1
2+
--> $DIR/issue-84660-unsoundness.rs:28:1
33
|
44
LL | impl<In, Out> Trait<Bar, In> for Out {
55
| ------------------------------------ first implementation here
66
...
77
LL | impl<In, Out> Trait<(), In> for Out {
88
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
99

10-
error: item does not constrain `Bar::{opaque#0}`, but has it in its signature
11-
--> $DIR/issue-84660-unsoundness.rs:22:8
12-
|
13-
LL | fn convert(_i: In) -> Self::Out {
14-
| ^^^^^^^
15-
|
16-
= note: consider moving the opaque type's declaration and defining uses into a separate module
17-
note: this opaque type is in the signature
18-
--> $DIR/issue-84660-unsoundness.rs:12:12
19-
|
20-
LL | type Bar = impl Foo;
21-
| ^^^^^^^^
22-
23-
error: aborting due to 2 previous errors
10+
error: aborting due to 1 previous error
2411

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

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

+1-2
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:29:1
2+
--> $DIR/issue-84660-unsoundness.rs:28:1
33
|
44
LL | impl<In, Out> Trait<Bar, In> for Out {
55
| ------------------------------------ first implementation here
@@ -13,7 +13,6 @@ error[E0284]: type annotations needed: cannot satisfy `Bar == _`
1313
LL | fn convert(_i: In) -> Self::Out {
1414
| _____________________________________^
1515
LL | |
16-
LL | |
1716
LL | | unreachable!();
1817
LL | | }
1918
| |_____^ cannot satisfy `Bar == _`

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

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ impl<In, Out> Trait<Bar, In> for Out {
2121
type Out = Out;
2222
fn convert(_i: In) -> Self::Out {
2323
//[next]~^ ERROR: cannot satisfy `Bar == _`
24-
//[current]~^^ ERROR: item does not constrain `Bar::{opaque#0}`, but has it in its signature
2524
unreachable!();
2625
}
2726
}

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

-15
This file was deleted.

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

+1-3
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-
//@[next] check-pass
7+
//@check-pass
88

99
use std::fmt::Debug;
1010

@@ -15,8 +15,6 @@ trait Foo<A> {}
1515
impl Foo<()> for () {}
1616

1717
fn foo() -> impl Foo<FooX> {
18-
//[current]~^ ERROR: the trait bound `(): Foo<FooX>` is not satisfied
19-
// FIXME(type-alias-impl-trait): We could probably make this work.
2018
()
2119
}
2220

0 commit comments

Comments
 (0)