Normalize xform_ret_ty after constrained, bless tests

compiler-errors · compiler-errors · commit 35d60037eea2 · 2024-03-14T14:51:55.000-04:00
diff --git a/compiler/rustc_hir_typeck/src/method/probe.rs b/compiler/rustc_hir_typeck/src/method/probe.rs
@@ -1370,15 +1370,22 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                     (xform_self_ty, xform_ret_ty) =
                         self.xform_self_ty(probe.item, impl_ty, impl_args);
                     xform_self_ty = ocx.normalize(cause, self.param_env, xform_self_ty);
-                    // FIXME: Weirdly, we normalize the ret ty in this candidate, but no other candidates.
-                    xform_ret_ty = ocx.normalize(cause, self.param_env, xform_ret_ty);
-                    match ocx.eq_no_opaques(cause, self.param_env, xform_self_ty, self_ty) {
-                        Ok(()) => {}
+                    // FIXME: Make this `ocx.eq` once we define opaques more eagerly.
+                    match self.at(cause, self.param_env).eq(
+                        DefineOpaqueTypes::No,
+                        xform_self_ty,
+                        self_ty,
+                    ) {
+                        Ok(infer_ok) => {
+                            ocx.register_infer_ok_obligations(infer_ok);
+                        }
                         Err(err) => {
                             debug!("--> cannot relate self-types {:?}", err);
                             return ProbeResult::NoMatch;
                         }
                     }
+                    // FIXME: Weirdly, we normalize the ret ty in this candidate, but no other candidates.
+                    xform_ret_ty = ocx.normalize(cause, self.param_env, xform_ret_ty);
                     // Check whether the impl imposes obligations we have to worry about.
                     let impl_def_id = probe.item.container_id(self.tcx);
                     let impl_bounds =
@@ -1420,11 +1427,19 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                         infer::FnCall,
                         poly_trait_ref,
                     );
+                    let trait_ref = ocx.normalize(cause, self.param_env, trait_ref);
                     (xform_self_ty, xform_ret_ty) =
                         self.xform_self_ty(probe.item, trait_ref.self_ty(), trait_ref.args);
                     xform_self_ty = ocx.normalize(cause, self.param_env, xform_self_ty);
-                    match ocx.eq_no_opaques(cause, self.param_env, xform_self_ty, self_ty) {
-                        Ok(()) => {}
+                    // FIXME: Make this `ocx.eq` once we define opaques more eagerly.
+                    match self.at(cause, self.param_env).eq(
+                        DefineOpaqueTypes::No,
+                        xform_self_ty,
+                        self_ty,
+                    ) {
+                        Ok(infer_ok) => {
+                            ocx.register_infer_ok_obligations(infer_ok);
+                        }
                         Err(err) => {
                             debug!("--> cannot relate self-types {:?}", err);
                             return ProbeResult::NoMatch;
@@ -1447,8 +1462,15 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                     (xform_self_ty, xform_ret_ty) =
                         self.xform_self_ty(probe.item, trait_ref.self_ty(), trait_ref.args);
                     xform_self_ty = ocx.normalize(cause, self.param_env, xform_self_ty);
-                    match ocx.eq_no_opaques(cause, self.param_env, xform_self_ty, self_ty) {
-                        Ok(()) => {}
+                    // FIXME: Make this `ocx.eq` once we define opaques more eagerly.
+                    match self.at(cause, self.param_env).eq(
+                        DefineOpaqueTypes::No,
+                        xform_self_ty,
+                        self_ty,
+                    ) {
+                        Ok(infer_ok) => {
+                            ocx.register_infer_ok_obligations(infer_ok);
+                        }
                         Err(err) => {
                             debug!("--> cannot relate self-types {:?}", err);
                             return ProbeResult::NoMatch;
diff --git a/compiler/rustc_trait_selection/src/traits/engine.rs b/compiler/rustc_trait_selection/src/traits/engine.rs
@@ -129,19 +129,6 @@ impl<'a, 'tcx> ObligationCtxt<'a, 'tcx> {
             .map(|infer_ok| self.register_infer_ok_obligations(infer_ok))
     }
 
-    pub fn eq_no_opaques<T: ToTrace<'tcx>>(
-        &self,
-        cause: &ObligationCause<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-        expected: T,
-        actual: T,
-    ) -> Result<(), TypeError<'tcx>> {
-        self.infcx
-            .at(cause, param_env)
-            .eq(DefineOpaqueTypes::No, expected, actual)
-            .map(|infer_ok| self.register_infer_ok_obligations(infer_ok))
-    }
-
     /// Checks whether `expected` is a subtype of `actual`: `expected <: actual`.
     pub fn sub<T: ToTrace<'tcx>>(
         &self,
diff --git a/tests/ui/generic-associated-types/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs b/tests/ui/generic-associated-types/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs
@@ -29,5 +29,5 @@ where
 
 fn main() {
     let mut list = RcNode::<i32>::new();
-    //~^ ERROR the size for values of type `Node<i32, RcFamily>` cannot be known at compilation time
+    //~^ ERROR the variant or associated item `new` exists for enum `Node<i32, RcFamily>`, but its trait bounds were not satisfied
 }
diff --git a/tests/ui/impl-trait/issues/issue-62742.rs b/tests/ui/impl-trait/issues/issue-62742.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 fn _alias_check() {
     WrongImpl::foo(0i32);
     //~^ ERROR the trait bound `RawImpl<_>: Raw<_>` is not satisfied
-    //~| ERROR the trait bound `RawImpl<_>: Raw<_>` is not satisfied
+    //~| ERROR the function or associated item `foo` exists for struct `SafeImpl<_, RawImpl<_>>`, but its trait bounds were not satisfied
     WrongImpl::<()>::foo(0i32);
     //~^ ERROR the trait bound `RawImpl<()>: Raw<()>` is not satisfied
     //~| ERROR trait bounds were not satisfied
diff --git a/tests/ui/impl-trait/issues/issue-84073.rs b/tests/ui/impl-trait/issues/issue-84073.rs
@@ -29,5 +29,6 @@ where
 }
 
 fn main() {
-    Race::new(|race| race.when()); //~ ERROR overflow assigning `_` to `Option<_>`
+    Race::new(|race| race.when());
+    //~^ ERROR the method `when` exists for struct `RaceBuilder<_, Never<_>>`, but its trait bounds were not satisfied
 }
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
@@ -6,7 +6,6 @@ LL |     let _result = &Some(42).as_deref();
    |
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
-           which is required by `<{integer} as Deref>::Target = _`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
@@ -6,7 +6,6 @@ LL |     let _result = &mut Some(42).as_deref_mut();
    |
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
-           which is required by `<{integer} as Deref>::Target = _`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
@@ -6,7 +6,6 @@ LL |     let _result = &Ok(42).as_deref();
    |
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
-           which is required by `<{integer} as Deref>::Target = _`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
@@ -6,7 +6,6 @@ LL |     let _result = &mut Ok(42).as_deref_mut();
    |
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
-           which is required by `<{integer} as Deref>::Target = _`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-57362-2.rs b/tests/ui/issues/issue-57362-2.rs
@@ -18,8 +18,10 @@ impl<'a> X for fn(&'a ()) {
     }
 }
 
+// FIXME(@compiler-errors): This error message is less than helpful.
 fn g() {
-    let x = <fn (&())>::make_g(); //~ ERROR the function
+    let x = <fn (&())>::make_g();
+    //~^ ERROR no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
 }
 
 fn main() {}
diff --git a/tests/ui/issues/issue-57362-2.stderr b/tests/ui/issues/issue-57362-2.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
-  --> $DIR/issue-57362-2.rs:22:25
+  --> $DIR/issue-57362-2.rs:23:25
    |
 LL |     let x = <fn (&())>::make_g();
    |                         ^^^^^^ function or associated item not found in `fn(&())`
diff --git a/tests/ui/nll/issue-57642-higher-ranked-subtype.rs b/tests/ui/nll/issue-57642-higher-ranked-subtype.rs
@@ -28,7 +28,8 @@ impl<T> Y for fn(T) {
 }
 
 fn higher_ranked_region_has_lost_its_binder() {
-    let x = <fn (&())>::make_g(); //~ ERROR the function
+    let x = <fn (&())>::make_g();
+    //~^ ERROR no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
 }
 
 fn magical() {
diff --git a/tests/ui/nll/issue-57642-higher-ranked-subtype.stderr b/tests/ui/nll/issue-57642-higher-ranked-subtype.stderr
@@ -12,7 +12,7 @@ LL | trait X {
    | ^^^^^^^
 
 error[E0599]: no function or associated item named `make_f` found for fn pointer `for<'a> fn(&'a ())` in the current scope
-  --> $DIR/issue-57642-higher-ranked-subtype.rs:35:25
+  --> $DIR/issue-57642-higher-ranked-subtype.rs:36:25
    |
 LL |     let x = <fn (&())>::make_f();
    |                         ^^^^^^ function or associated item not found in `fn(&())`

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ where`
`29`	`29`
`30`	`30`	`fn main() {`
`31`	`31`	`let mut list = RcNode::<i32>::new();`
`32`		- //~^ ERROR the size for values of type `Node<i32, RcFamily>` cannot be known at compilation time
	`32`	+ //~^ ERROR the variant or associated item `new` exists for enum `Node<i32, RcFamily>`, but its trait bounds were not satisfied
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@ where`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`fn main() {`
`32`		- Race::new(\|race\| race.when()); //~ ERROR overflow assigning `_` to `Option<_>`
	`32`	`+ Race::new(\|race\| race.when());`
	`33`	+ //~^ ERROR the method `when` exists for struct `RaceBuilder<_, Never<_>>`, but its trait bounds were not satisfied
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| let _result = &Some(42).as_deref();`
`6`	`6`	`\|`
`7`	`7`	`= note: the following trait bounds were not satisfied:`
`8`	`8`	`{integer}: Deref`
`9`		- which is required by `<{integer} as Deref>::Target = _`
`10`	`9`
`11`	`10`	`error: aborting due to 1 previous error`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| let _result = &mut Some(42).as_deref_mut();`
`6`	`6`	`\|`
`7`	`7`	`= note: the following trait bounds were not satisfied:`
`8`	`8`	`{integer}: Deref`
`9`		- which is required by `<{integer} as Deref>::Target = _`
`10`	`9`
`11`	`10`	`error: aborting due to 1 previous error`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| let _result = &Ok(42).as_deref();`
`6`	`6`	`\|`
`7`	`7`	`= note: the following trait bounds were not satisfied:`
`8`	`8`	`{integer}: Deref`
`9`		- which is required by `<{integer} as Deref>::Target = _`
`10`	`9`
`11`	`10`	`error: aborting due to 1 previous error`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,10 @@ impl<'a> X for fn(&'a ()) {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
	`21`	`+// FIXME(@compiler-errors): This error message is less than helpful.`
`21`	`22`	`fn g() {`
`22`		`- let x = <fn (&())>::make_g(); //~ ERROR the function`
	`23`	`+ let x = <fn (&())>::make_g();`
	`24`	+ //~^ ERROR no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0599]: no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
`2`		`- --> $DIR/issue-57362-2.rs:22:25`
	`2`	`+ --> $DIR/issue-57362-2.rs:23:25`
`3`	`3`	`\|`
`4`	`4`	`LL \| let x = <fn (&())>::make_g();`
`5`	`5`	\| ^^^^^^ function or associated item not found in `fn(&())`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ impl<T> Y for fn(T) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`fn higher_ranked_region_has_lost_its_binder() {`
`31`		`- let x = <fn (&())>::make_g(); //~ ERROR the function`
	`31`	`+ let x = <fn (&())>::make_g();`
	`32`	+ //~^ ERROR no function or associated item named `make_g` found for fn pointer `for<'a> fn(&'a ())` in the current scope
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`fn magical() {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ LL \| trait X {`
`12`	`12`	`\| ^^^^^^^`
`13`	`13`
`14`	`14`	error[E0599]: no function or associated item named `make_f` found for fn pointer `for<'a> fn(&'a ())` in the current scope
`15`		`- --> $DIR/issue-57642-higher-ranked-subtype.rs:35:25`
	`15`	`+ --> $DIR/issue-57642-higher-ranked-subtype.rs:36:25`
`16`	`16`	`\|`
`17`	`17`	`LL \| let x = <fn (&())>::make_f();`
`18`	`18`	\| ^^^^^^ function or associated item not found in `fn(&())`