Revert "Revert "When checking whether an impl applies, constrain hidden types of opaque types.""

This reverts commit ad00868.

Author: oli-obk

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

@@ -2532,7 +2532,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
         let InferOk { obligations, .. } = self
             .infcx
             .at(&cause, obligation.param_env)
-            .eq(DefineOpaqueTypes::No, placeholder_obligation_trait_ref, impl_trait_ref)
+            .eq(DefineOpaqueTypes::Yes, placeholder_obligation_trait_ref, impl_trait_ref)
             .map_err(|e| {
                 debug!("match_impl: failed eq_trait_refs due to `{}`", e.to_string(self.tcx()))
             })?;

tests/ui/auto-traits/opaque_type_candidate_selection.rs

@@ -1,13 +1,12 @@
 //! used to ICE: #119272
 
-//@ check-pass
-
 #![feature(type_alias_impl_trait)]
 mod defining_scope {
     use super::*;
     pub type Alias<T> = impl Sized;
 
     pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
+        //~^ ERROR: type annotations needed
         x
     }
 }

tests/ui/auto-traits/opaque_type_candidate_selection.stderr

@@ -0,0 +1,21 @@
+error[E0284]: type annotations needed
+  --> $DIR/opaque_type_candidate_selection.rs:8:20
+   |
+LL |     pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
+   |                    ^ cannot infer type
+   |
+   = note: cannot satisfy `<Alias<T> as Trait<T>>::Assoc == _`
+note: required because it appears within the type `Container<Alias<T>, T>`
+  --> $DIR/opaque_type_candidate_selection.rs:14:8
+   |
+LL | struct Container<T: Trait<U>, U> {
+   |        ^^^^^^^^^
+   = help: unsized fn params are gated as an unstable feature
+help: function arguments must have a statically known size, borrowed types always have a known size
+   |
+LL |     pub fn cast<T>(x: &Container<Alias<T>, T>) -> Container<T, T> {
+   |                       +
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0284`.

tests/ui/coherence/occurs-check/opaques.next.stderr

@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `Trait<_>`
-  --> $DIR/opaques.rs:30:1
+  --> $DIR/opaques.rs:29:1
    |
 LL | impl<T> Trait<T> for T {
    | ---------------------- first implementation here
@@ -8,7 +8,7 @@ LL | impl<T> Trait<T> for defining_scope::Alias<T> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
 
 error[E0282]: type annotations needed
-  --> $DIR/opaques.rs:13:20
+  --> $DIR/opaques.rs:12:20
    |
 LL |     pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
    |                    ^ cannot infer type

tests/ui/coherence/occurs-check/opaques.old.stderr

@@ -0,0 +1,21 @@
+error[E0284]: type annotations needed
+  --> $DIR/opaques.rs:12:20
+   |
+LL |     pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
+   |                    ^ cannot infer type
+   |
+   = note: cannot satisfy `<Alias<T> as Trait<T>>::Assoc == _`
+note: required because it appears within the type `Container<Alias<T>, T>`
+  --> $DIR/opaques.rs:18:8
+   |
+LL | struct Container<T: Trait<U>, U> {
+   |        ^^^^^^^^^
+   = help: unsized fn params are gated as an unstable feature
+help: function arguments must have a statically known size, borrowed types always have a known size
+   |
+LL |     pub fn cast<T>(x: &Container<Alias<T>, T>) -> Container<T, T> {
+   |                       +
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0284`.

tests/ui/coherence/occurs-check/opaques.rs

@@ -4,7 +4,6 @@
 // A regression test for #105787
 
 //@[old] known-bug: #105787
-//@[old] check-pass
 #![feature(type_alias_impl_trait)]
 mod defining_scope {
     use super::*;

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

@@ -1,9 +1,8 @@
 error[E0282]: type annotations needed for `&_`
-  --> $DIR/call_method_on_inherent_impl_on_rigid_type.rs:14:13
+  --> $DIR/call_method_on_inherent_impl_on_rigid_type.rs:15:13
    |
 LL |         let x = &my_foo();
    |             ^
-LL |
 LL |         x.my_debug();
    |           -------- type must be known at this point
    |

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

@@ -1,5 +1,6 @@
 //@ revisions: current next
 //@[next] compile-flags: -Znext-solver
+//@[current] check-pass
 
 trait MyDebug {
     fn my_debug(&self);
@@ -11,10 +12,8 @@ impl MyDebug for &() {
 
 fn my_foo() -> impl std::fmt::Debug {
     if false {
-        let x = &my_foo();
-        //[next]~^ ERROR: type annotations needed
+        let x = &my_foo(); //[next]~ ERROR: type annotations needed
         x.my_debug();
-        //[current]~^ ERROR: no method named `my_debug`
     }
     ()
 }

tests/ui/impl-trait/call_method_on_inherent_impl_on_rigid_type.rs

@@ -22,7 +22,7 @@ fn sum_to(n: u32) -> impl Foo {
         0
     } else {
         n + sum_to(n - 1)
-        //~^ ERROR cannot add `impl Foo` to `u32`
+        //~^ ERROR cannot satisfy `<u32 as Add<impl Foo>>::Output == i32`
     }
 }
 
@@ -32,12 +32,15 @@ trait Leak: Sized {
 }
 impl<T> Leak for T {
     default type T = ();
-    default fn leak(self) -> Self::T { panic!() }
+    default fn leak(self) -> Self::T {
+        panic!()
+    }
 }
 impl Leak for i32 {
     type T = i32;
-    fn leak(self) -> i32 { self }
+    fn leak(self) -> i32 {
+        self
+    }
 }
 
-fn main() {
-}
+fn main() {}