Method resolution constrains hidden types instead of rejecting method candidates

Author: oli-obk

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

@@ -1448,7 +1448,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             let impl_ty = self.normalize(span, tcx.type_of(impl_def_id).instantiate(tcx, args));
             let self_ty = self.normalize(span, self_ty);
             match self.at(&self.misc(span), self.param_env).eq(
-                DefineOpaqueTypes::No,
+                DefineOpaqueTypes::Yes,
                 impl_ty,
                 self_ty,
             ) {

compiler/rustc_hir_typeck/src/method/confirm.rs

@@ -499,7 +499,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
                 args,
             })),
         );
-        match self.at(&cause, self.param_env).sup(DefineOpaqueTypes::No, method_self_ty, self_ty) {
+        match self.at(&cause, self.param_env).sup(DefineOpaqueTypes::Yes, method_self_ty, self_ty) {
             Ok(InferOk { obligations, value: () }) => {
                 self.register_predicates(obligations);
             }

compiler/rustc_hir_typeck/src/method/probe.rs

@@ -1488,7 +1488,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
         self.probe(|_| {
             // First check that the self type can be related.
             let sub_obligations = match self.at(&ObligationCause::dummy(), self.param_env).sup(
-                DefineOpaqueTypes::No,
+                DefineOpaqueTypes::Yes,
                 probe.xform_self_ty,
                 self_ty,
             ) {

tests/ui/impl-trait/issues/issue-70877.rs

@@ -27,8 +27,8 @@ fn ham() -> Foo {
 
 fn oof(_: Foo) -> impl std::fmt::Debug {
     let mut bar = ham();
-    let func = bar.next().unwrap();
-    return func(&"oof"); //~ ERROR opaque type's hidden type cannot be another opaque type
+    let func = bar.next().unwrap(); //~ ERROR: type annotations needed
+    return func(&"oof");
 }
 
 fn main() {

tests/ui/impl-trait/issues/issue-70877.stderr

@@ -1,19 +1,16 @@
-error: opaque type's hidden type cannot be another opaque type from the same scope
-  --> $DIR/issue-70877.rs:31:12
+error[E0282]: type annotations needed
+  --> $DIR/issue-70877.rs:30:9
    |
+LL |     let func = bar.next().unwrap();
+   |         ^^^^
 LL |     return func(&"oof");
-   |            ^^^^^^^^^^^^ one of the two opaque types used here has to be outside its defining scope
+   |            ------------ type must be known at this point
    |
-note: opaque type whose hidden type is being assigned
-  --> $DIR/issue-70877.rs:28:19
+help: consider giving `func` an explicit type
    |
-LL | fn oof(_: Foo) -> impl std::fmt::Debug {
-   |                   ^^^^^^^^^^^^^^^^^^^^
-note: opaque type being used as hidden type
-  --> $DIR/issue-70877.rs:4:15
-   |
-LL | type FooRet = impl std::fmt::Debug;
-   |               ^^^^^^^^^^^^^^^^^^^^
+LL |     let func: /* Type */ = bar.next().unwrap();
+   |             ++++++++++++
 
 error: aborting due to 1 previous error
 
+For more information about this error, try `rustc --explain E0282`.

tests/ui/impl-trait/method-resolution.rs

@@ -1,3 +1,5 @@
+//@ check-pass
+
 trait Trait {}
 
 impl Trait for u32 {}
@@ -9,11 +11,9 @@ impl Bar<u32> {
 }
 
 fn foo(x: bool) -> Bar<impl Sized> {
-    //~^ ERROR: cycle detected
     if x {
         let x = foo(false);
         x.foo();
-        //~^ ERROR: no method named `foo` found
     }
     todo!()
 }

tests/ui/impl-trait/method-resolution.stderr

@@ -13,11 +13,10 @@ impl Bar<i32> {
 }
 
 fn foo(x: bool) -> Bar<impl Sized> {
-    //~^ ERROR: cycle
     if x {
         let x = foo(false);
         x.foo();
-        //~^ ERROR: no method named `foo`
+        //~^ ERROR: multiple applicable items in scope
     }
     todo!()
 }

tests/ui/impl-trait/method-resolution3.rs

@@ -1,37 +1,20 @@
-error[E0599]: no method named `foo` found for struct `Bar<impl Sized>` in the current scope
-  --> $DIR/method-resolution3.rs:19:11
+error[E0034]: multiple applicable items in scope
+  --> $DIR/method-resolution3.rs:18:11
    |
-LL | struct Bar<T>(T);
-   | ------------- method `foo` not found for this struct
-...
 LL |         x.foo();
-   |           ^^^ method not found in `Bar<impl Sized>`
+   |           ^^^ multiple `foo` found
    |
-   = note: the method was found for
-           - `Bar<i32>`
-           - `Bar<u32>`
-
-error[E0391]: cycle detected when computing type of opaque `foo::{opaque#0}`
-  --> $DIR/method-resolution3.rs:15:24
-   |
-LL | fn foo(x: bool) -> Bar<impl Sized> {
-   |                        ^^^^^^^^^^
+note: candidate #1 is defined in an impl for the type `Bar<i32>`
+  --> $DIR/method-resolution3.rs:12:5
    |
-note: ...which requires type-checking `foo`...
-  --> $DIR/method-resolution3.rs:19:9
-   |
-LL |         x.foo();
-   |         ^
-   = note: ...which requires evaluating trait selection obligation `Bar<foo::{opaque#0}>: core::marker::Unpin`...
-   = note: ...which again requires computing type of opaque `foo::{opaque#0}`, completing the cycle
-note: cycle used when computing type of `foo::{opaque#0}`
-  --> $DIR/method-resolution3.rs:15:24
+LL |     fn foo(self) {}
+   |     ^^^^^^^^^^^^
+note: candidate #2 is defined in an impl for the type `Bar<u32>`
+  --> $DIR/method-resolution3.rs:8:5
    |
-LL | fn foo(x: bool) -> Bar<impl Sized> {
-   |                        ^^^^^^^^^^
-   = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
+LL |     fn foo(self) {}
+   |     ^^^^^^^^^^^^
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-Some errors have detailed explanations: E0391, E0599.
-For more information about an error, try `rustc --explain E0391`.
+For more information about this error, try `rustc --explain E0034`.

tests/ui/impl-trait/method-resolution3.stderr

@@ -1,4 +1,7 @@
 #![feature(type_alias_impl_trait)]
+
+//@ check-pass
+
 struct Foo<T>(T);
 
 impl Foo<u32> {
@@ -15,14 +18,11 @@ fn bar() -> Bar {
 impl Foo<Bar> {
     fn foo() -> Bar {
         Self::method();
-        //~^ ERROR: no function or associated item named `method` found for struct `Foo<Bar>`
         Foo::<Bar>::method();
-        //~^ ERROR: no function or associated item named `method` found for struct `Foo<Bar>`
         let x = Foo(bar());
         Foo::method2(x);
         let x = Self(bar());
         Self::method2(x);
-        //~^ ERROR: no function or associated item named `method2` found for struct `Foo<Bar>`
         todo!()
     }
 }

tests/ui/methods/opaque_param_in_ufc.rs

@@ -1,14 +1,13 @@
 #![feature(type_alias_impl_trait)]
+//@ check-pass
 
 type Foo = impl Sized;
-//~^ ERROR: cycle
 
 struct Bar<T>(T);
 
 impl Bar<Foo> {
     fn bar(self) {
         self.foo()
-        //~^ ERROR: no method named `foo`
     }
 }