Rollup merge of #138838 - compiler-errors:new-solver-crashes-tweaks, r=lcnr

TaKO8Ki · web-flow · commit b2629be2de43 · 2025-03-25T15:36:35.000+09:00
Fix/tweak some tests in new solver

Bunch of miscellaneous new solver tweaks that I found from the failing tests. Can split these out, but they all seemed small enough to not warrant separate PRs.

r? lcnr
diff --git a/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs b/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
@@ -971,15 +971,17 @@ where
         rhs: T,
     ) -> Result<(), NoSolution> {
         let goals = self.delegate.relate(param_env, lhs, variance, rhs, self.origin_span)?;
-        if cfg!(debug_assertions) {
-            for g in goals.iter() {
-                match g.predicate.kind().skip_binder() {
-                    ty::PredicateKind::Subtype { .. } | ty::PredicateKind::AliasRelate(..) => {}
-                    p => unreachable!("unexpected nested goal in `relate`: {p:?}"),
+        for &goal in goals.iter() {
+            let source = match goal.predicate.kind().skip_binder() {
+                ty::PredicateKind::Subtype { .. } | ty::PredicateKind::AliasRelate(..) => {
+                    GoalSource::TypeRelating
                 }
-            }
+                // FIXME(-Znext-solver=coinductive): should these WF goals also be unproductive?
+                ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(_)) => GoalSource::Misc,
+                p => unreachable!("unexpected nested goal in `relate`: {p:?}"),
+            };
+            self.add_goal(source, goal);
         }
-        self.add_goals(GoalSource::TypeRelating, goals);
         Ok(())
     }
 
diff --git a/compiler/rustc_ty_utils/src/layout.rs b/compiler/rustc_ty_utils/src/layout.rs
@@ -611,7 +611,7 @@ fn layout_of_uncached<'tcx>(
         }
 
         // Types with no meaningful known layout.
-        ty::Param(_) => {
+        ty::Param(_) | ty::Placeholder(..) => {
             return Err(error(cx, LayoutError::TooGeneric(ty)));
         }
 
@@ -628,11 +628,7 @@ fn layout_of_uncached<'tcx>(
             return Err(error(cx, err));
         }
 
-        ty::Placeholder(..)
-        | ty::Bound(..)
-        | ty::CoroutineWitness(..)
-        | ty::Infer(_)
-        | ty::Error(_) => {
+        ty::Bound(..) | ty::CoroutineWitness(..) | ty::Infer(_) | ty::Error(_) => {
             // `ty::Error` is handled at the top of this function.
             bug!("layout_of: unexpected type `{ty}`")
         }
diff --git a/tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.current.stderr b/tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.current.stderr
@@ -1,12 +1,12 @@
 error[E0283]: type annotations needed
-  --> $DIR/dedup-normalized-2-higher-ranked.rs:23:5
+  --> $DIR/dedup-normalized-2-higher-ranked.rs:28:5
    |
 LL |     impls(rigid);
    |     ^^^^^ cannot infer type of the type parameter `U` declared on the function `impls`
    |
    = note: cannot satisfy `for<'b> <P as Trait>::Rigid: Bound<'b, _>`
 note: required by a bound in `impls`
-  --> $DIR/dedup-normalized-2-higher-ranked.rs:20:13
+  --> $DIR/dedup-normalized-2-higher-ranked.rs:25:13
    |
 LL | fn impls<T: for<'b> Bound<'b, U>, U>(_: T) {}
    |             ^^^^^^^^^^^^^^^^^^^^ required by this bound in `impls`
diff --git a/tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.rs b/tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.rs
@@ -1,3 +1,8 @@
+//@ revisions: current next
+//@ ignore-compare-mode-next-solver (explicit revisions)
+//@[next] compile-flags: -Znext-solver
+//@[next] check-pass
+
 // We try to prove `for<'b> T::Rigid: Bound<'b, ?0>` and have 2 candidates from where-clauses:
 //
 // - `for<'a> Bound<'a, String>`
@@ -21,7 +26,7 @@ fn impls<T: for<'b> Bound<'b, U>, U>(_: T) {}
 
 fn test<P: Trait>(rigid: P::Rigid) {
     impls(rigid);
-    //~^ ERROR type annotations needed
+    //[current]~^ ERROR type annotations needed
 }
 
 fn main() {}
diff --git a/tests/ui/consts/too_generic_eval_ice.current.stderr b/tests/ui/consts/too_generic_eval_ice.current.stderr
@@ -1,29 +1,29 @@
 error: constant expression depends on a generic parameter
-  --> $DIR/too_generic_eval_ice.rs:7:13
+  --> $DIR/too_generic_eval_ice.rs:11:13
    |
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |             ^^^^^^^^^^^^^^^
    |
    = note: this may fail depending on what value the parameter takes
 
 error: constant expression depends on a generic parameter
-  --> $DIR/too_generic_eval_ice.rs:7:9
+  --> $DIR/too_generic_eval_ice.rs:11:9
    |
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |         ^^^^^^^^^^^^^^^^^^^^
    |
    = note: this may fail depending on what value the parameter takes
 
 error: constant expression depends on a generic parameter
-  --> $DIR/too_generic_eval_ice.rs:7:30
+  --> $DIR/too_generic_eval_ice.rs:11:30
    |
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |                              ^^
    |
    = note: this may fail depending on what value the parameter takes
 
 error[E0277]: can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
-  --> $DIR/too_generic_eval_ice.rs:7:30
+  --> $DIR/too_generic_eval_ice.rs:11:30
    |
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |                              ^^ no implementation for `[{integer}; Self::HOST_SIZE] == [{integer}; 0]`
diff --git a/tests/ui/consts/too_generic_eval_ice.next.stderr b/tests/ui/consts/too_generic_eval_ice.next.stderr
@@ -0,0 +1,9 @@
+error[E0284]: type annotations needed: cannot satisfy `the constant `Self::HOST_SIZE` can be evaluated`
+  --> $DIR/too_generic_eval_ice.rs:11:13
+   |
+LL |         [5; Self::HOST_SIZE] == [6; 0]
+   |             ^^^^^^^^^^^^^^^ cannot satisfy `the constant `Self::HOST_SIZE` can be evaluated`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0284`.
diff --git a/tests/ui/consts/too_generic_eval_ice.rs b/tests/ui/consts/too_generic_eval_ice.rs
@@ -1,14 +1,19 @@
+//@ revisions: current next
+//@ ignore-compare-mode-next-solver (explicit revisions)
+//@[next] compile-flags: -Znext-solver
+
 pub struct Foo<A, B>(A, B);
 
 impl<A, B> Foo<A, B> {
     const HOST_SIZE: usize = std::mem::size_of::<B>();
 
     pub fn crash() -> bool {
         [5; Self::HOST_SIZE] == [6; 0]
-        //~^ ERROR constant expression depends on a generic parameter
-        //~| ERROR constant expression depends on a generic parameter
-        //~| ERROR constant expression depends on a generic parameter
-        //~| ERROR can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
+        //[current]~^ ERROR constant expression depends on a generic parameter
+        //[current]~| ERROR constant expression depends on a generic parameter
+        //[current]~| ERROR constant expression depends on a generic parameter
+        //[current]~| ERROR can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
+        //[next]~^^^^^ ERROR type annotations needed
     }
 }
 
diff --git a/tests/ui/privacy/where-pub-type-impls-priv-trait.rs b/tests/ui/privacy/where-pub-type-impls-priv-trait.rs
@@ -3,7 +3,6 @@
 // priv-in-pub lint tests where the private trait bounds a public type
 
 #![crate_type = "lib"]
-#![feature(generic_const_exprs)]
 #![allow(incomplete_features)]
 
 struct PrivTy;
diff --git a/tests/ui/privacy/where-pub-type-impls-priv-trait.stderr b/tests/ui/privacy/where-pub-type-impls-priv-trait.stderr
@@ -1,30 +1,30 @@
 warning: trait `PrivTr` is more private than the item `S`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:20:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:19:1
    |
 LL | pub struct S
    | ^^^^^^^^^^^^ struct `S` is reachable at visibility `pub`
    |
 note: but trait `PrivTr` is only usable at visibility `pub(crate)`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:10:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:9:1
    |
 LL | trait PrivTr {}
    | ^^^^^^^^^^^^
    = note: `#[warn(private_bounds)]` on by default
 
 warning: trait `PrivTr` is more private than the item `E`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:27:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:26:1
    |
 LL | pub enum E
    | ^^^^^^^^^^ enum `E` is reachable at visibility `pub`
    |
 note: but trait `PrivTr` is only usable at visibility `pub(crate)`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:10:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:9:1
    |
 LL | trait PrivTr {}
    | ^^^^^^^^^^^^
 
 warning: trait `PrivTr` is more private than the item `f`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:34:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:33:1
    |
 LL | / pub fn f()
 LL | |
@@ -33,13 +33,13 @@ LL | |     PubTy: PrivTr
    | |_________________^ function `f` is reachable at visibility `pub`
    |
 note: but trait `PrivTr` is only usable at visibility `pub(crate)`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:10:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:9:1
    |
 LL | trait PrivTr {}
    | ^^^^^^^^^^^^
 
 warning: trait `PrivTr` is more private than the item `S`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:41:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:40:1
    |
 LL | / impl S
 LL | |
@@ -48,13 +48,13 @@ LL | |     PubTy: PrivTr
    | |_________________^ implementation `S` is reachable at visibility `pub`
    |
 note: but trait `PrivTr` is only usable at visibility `pub(crate)`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:10:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:9:1
    |
 LL | trait PrivTr {}
    | ^^^^^^^^^^^^
 
 warning: trait `PrivTr` is more private than the item `S::f`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:46:5
+  --> $DIR/where-pub-type-impls-priv-trait.rs:45:5
    |
 LL | /     pub fn f()
 LL | |
@@ -63,7 +63,7 @@ LL | |         PubTy: PrivTr
    | |_____________________^ associated function `S::f` is reachable at visibility `pub`
    |
 note: but trait `PrivTr` is only usable at visibility `pub(crate)`
-  --> $DIR/where-pub-type-impls-priv-trait.rs:10:1
+  --> $DIR/where-pub-type-impls-priv-trait.rs:9:1
    |
 LL | trait PrivTr {}
    | ^^^^^^^^^^^^
diff --git a/tests/ui/traits/next-solver/well-formed-in-relate.rs b/tests/ui/traits/next-solver/well-formed-in-relate.rs
@@ -0,0 +1,21 @@
+fn main() {
+    let x;
+    //~^ ERROR type annotations needed for `Map<_, _>`
+    higher_ranked();
+    x = unconstrained_map();
+}
+
+fn higher_ranked() where for<'a> &'a (): Sized {}
+
+struct Map<T, U> where T: Fn() -> U {
+    t: T,
+}
+
+trait Mirror {
+    type Assoc;
+}
+impl<T> Mirror for T {
+    type Assoc = T;
+}
+
+fn unconstrained_map<T: Fn() -> U, U>() -> <Map<T, U> as Mirror>::Assoc { todo!() }
diff --git a/tests/ui/traits/next-solver/well-formed-in-relate.stderr b/tests/ui/traits/next-solver/well-formed-in-relate.stderr
@@ -0,0 +1,27 @@
+error[E0283]: type annotations needed for `Map<_, _>`
+  --> $DIR/well-formed-in-relate.rs:2:9
+   |
+LL |     let x;
+   |         ^
+...
+LL |     x = unconstrained_map();
+   |         ------------------- type must be known at this point
+   |
+   = note: multiple `impl`s satisfying `_: Fn()` found in the following crates: `alloc`, `core`:
+           - impl<A, F> Fn<A> for &F
+             where A: Tuple, F: Fn<A>, F: ?Sized;
+           - impl<Args, F, A> Fn<Args> for Box<F, A>
+             where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
+note: required by a bound in `unconstrained_map`
+  --> $DIR/well-formed-in-relate.rs:21:25
+   |
+LL | fn unconstrained_map<T: Fn() -> U, U>() -> <Map<T, U> as Mirror>::Assoc { todo!() }
+   |                         ^^^^^^^^^ required by this bound in `unconstrained_map`
+help: consider giving `x` an explicit type, where the type for type parameter `T` is specified
+   |
+LL |     let x: Map<T, U>;
+   |          +++++++++++
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0283`.

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ fn layout_of_uncached<'tcx>(`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`// Types with no meaningful known layout.`
`614`		`- ty::Param(_) => {`
	`614`	`+ ty::Param(_) \| ty::Placeholder(..) => {`
`615`	`615`	`return Err(error(cx, LayoutError::TooGeneric(ty)));`
`616`	`616`	`}`
`617`	`617`
`@@ -628,11 +628,7 @@ fn layout_of_uncached<'tcx>(`
`628`	`628`	`return Err(error(cx, err));`
`629`	`629`	`}`
`630`	`630`
`631`		`- ty::Placeholder(..)`
`632`		`- \| ty::Bound(..)`
`633`		`- \| ty::CoroutineWitness(..)`
`634`		`- \| ty::Infer(_)`
`635`		`- \| ty::Error(_) => {`
	`631`	`+ ty::Bound(..) \| ty::CoroutineWitness(..) \| ty::Infer(_) \| ty::Error(_) => {`
`636`	`632`	// `ty::Error` is handled at the top of this function.
`637`	`633`	bug!("layout_of: unexpected type `{ty}`")
`638`	`634`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`error[E0283]: type annotations needed`
`2`		`- --> $DIR/dedup-normalized-2-higher-ranked.rs:23:5`
	`2`	`+ --> $DIR/dedup-normalized-2-higher-ranked.rs:28:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| impls(rigid);`
`5`	`5`	\| ^^^^^ cannot infer type of the type parameter `U` declared on the function `impls`
`6`	`6`	`\|`
`7`	`7`	= note: cannot satisfy `for<'b> <P as Trait>::Rigid: Bound<'b, _>`
`8`	`8`	note: required by a bound in `impls`
`9`		`- --> $DIR/dedup-normalized-2-higher-ranked.rs:20:13`
	`9`	`+ --> $DIR/dedup-normalized-2-higher-ranked.rs:25:13`
`10`	`10`	`\|`
`11`	`11`	`LL \| fn impls<T: for<'b> Bound<'b, U>, U>(_: T) {}`
`12`	`12`	\| ^^^^^^^^^^^^^^^^^^^^ required by this bound in `impls`
Original file line number	Diff line number	Diff line change
`@@ -1,29 +1,29 @@`
`1`	`1`	`error: constant expression depends on a generic parameter`
`2`		`- --> $DIR/too_generic_eval_ice.rs:7:13`
	`2`	`+ --> $DIR/too_generic_eval_ice.rs:11:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| [5; Self::HOST_SIZE] == [6; 0]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`= note: this may fail depending on what value the parameter takes`
`8`	`8`
`9`	`9`	`error: constant expression depends on a generic parameter`
`10`		`- --> $DIR/too_generic_eval_ice.rs:7:9`
	`10`	`+ --> $DIR/too_generic_eval_ice.rs:11:9`
`11`	`11`	`\|`
`12`	`12`	`LL \| [5; Self::HOST_SIZE] == [6; 0]`
`13`	`13`	`\| ^^^^^^^^^^^^^^^^^^^^`
`14`	`14`	`\|`
`15`	`15`	`= note: this may fail depending on what value the parameter takes`
`16`	`16`
`17`	`17`	`error: constant expression depends on a generic parameter`
`18`		`- --> $DIR/too_generic_eval_ice.rs:7:30`
	`18`	`+ --> $DIR/too_generic_eval_ice.rs:11:30`
`19`	`19`	`\|`
`20`	`20`	`LL \| [5; Self::HOST_SIZE] == [6; 0]`
`21`	`21`	`\| ^^`
`22`	`22`	`\|`
`23`	`23`	`= note: this may fail depending on what value the parameter takes`
`24`	`24`
`25`	`25`	error[E0277]: can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
`26`		`- --> $DIR/too_generic_eval_ice.rs:7:30`
	`26`	`+ --> $DIR/too_generic_eval_ice.rs:11:30`
`27`	`27`	`\|`
`28`	`28`	`LL \| [5; Self::HOST_SIZE] == [6; 0]`
`29`	`29`	\| ^^ no implementation for `[{integer}; Self::HOST_SIZE] == [{integer}; 0]`
Original file line number	Diff line number	Diff line change
`@@ -1,30 +1,30 @@`
`1`	`1`	warning: trait `PrivTr` is more private than the item `S`
`2`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:20:1`
	`2`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:19:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub struct S`
`5`	`5`	\| ^^^^^^^^^^^^ struct `S` is reachable at visibility `pub`
`6`	`6`	`\|`
`7`	`7`	note: but trait `PrivTr` is only usable at visibility `pub(crate)`
`8`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:10:1`
	`8`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:9:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| trait PrivTr {}`
`11`	`11`	`\| ^^^^^^^^^^^^`
`12`	`12`	= note: `#[warn(private_bounds)]` on by default
`13`	`13`
`14`	`14`	warning: trait `PrivTr` is more private than the item `E`
`15`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:27:1`
	`15`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:26:1`
`16`	`16`	`\|`
`17`	`17`	`LL \| pub enum E`
`18`	`18`	\| ^^^^^^^^^^ enum `E` is reachable at visibility `pub`
`19`	`19`	`\|`
`20`	`20`	note: but trait `PrivTr` is only usable at visibility `pub(crate)`
`21`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:10:1`
	`21`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:9:1`
`22`	`22`	`\|`
`23`	`23`	`LL \| trait PrivTr {}`
`24`	`24`	`\| ^^^^^^^^^^^^`
`25`	`25`
`26`	`26`	warning: trait `PrivTr` is more private than the item `f`
`27`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:34:1`
	`27`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:33:1`
`28`	`28`	`\|`
`29`	`29`	`LL \| / pub fn f()`
`30`	`30`	`LL \| \|`
`@@ -33,13 +33,13 @@ LL \| \| PubTy: PrivTr`
`33`	`33`	\| \|_________________^ function `f` is reachable at visibility `pub`
`34`	`34`	`\|`
`35`	`35`	note: but trait `PrivTr` is only usable at visibility `pub(crate)`
`36`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:10:1`
	`36`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:9:1`
`37`	`37`	`\|`
`38`	`38`	`LL \| trait PrivTr {}`
`39`	`39`	`\| ^^^^^^^^^^^^`
`40`	`40`
`41`	`41`	warning: trait `PrivTr` is more private than the item `S`
`42`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:41:1`
	`42`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:40:1`
`43`	`43`	`\|`
`44`	`44`	`LL \| / impl S`
`45`	`45`	`LL \| \|`
`@@ -48,13 +48,13 @@ LL \| \| PubTy: PrivTr`
`48`	`48`	\| \|_________________^ implementation `S` is reachable at visibility `pub`
`49`	`49`	`\|`
`50`	`50`	note: but trait `PrivTr` is only usable at visibility `pub(crate)`
`51`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:10:1`
	`51`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:9:1`
`52`	`52`	`\|`
`53`	`53`	`LL \| trait PrivTr {}`
`54`	`54`	`\| ^^^^^^^^^^^^`
`55`	`55`
`56`	`56`	warning: trait `PrivTr` is more private than the item `S::f`
`57`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:46:5`
	`57`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:45:5`
`58`	`58`	`\|`
`59`	`59`	`LL \| / pub fn f()`
`60`	`60`	`LL \| \|`
`@@ -63,7 +63,7 @@ LL \| \| PubTy: PrivTr`
`63`	`63`	\| \|_____________________^ associated function `S::f` is reachable at visibility `pub`
`64`	`64`	`\|`
`65`	`65`	note: but trait `PrivTr` is only usable at visibility `pub(crate)`
`66`		`- --> $DIR/where-pub-type-impls-priv-trait.rs:10:1`
	`66`	`+ --> $DIR/where-pub-type-impls-priv-trait.rs:9:1`
`67`	`67`	`\|`
`68`	`68`	`LL \| trait PrivTr {}`
`69`	`69`	`\| ^^^^^^^^^^^^`