Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit d23ab33

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#138838
Rollup merge of rust-lang#138838 - compiler-errors:new-solver-crashes-tweaks, r=lcnr 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
2 parents 7d49ae9 + 484362e commit d23ab33

File tree

11 files changed

+99
-35
lines changed

11 files changed

+99
-35
lines changed

‎compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -971,15 +971,17 @@ where
971971
rhs: T,
972972
) -> Result<(), NoSolution> {
973973
let goals = self.delegate.relate(param_env, lhs, variance, rhs, self.origin_span)?;
974-
if cfg!(debug_assertions) {
975-
for g in goals.iter() {
976-
match g.predicate.kind().skip_binder() {
977-
ty::PredicateKind::Subtype { .. } | ty::PredicateKind::AliasRelate(..) => {}
978-
p => unreachable!("unexpected nested goal in `relate`: {p:?}"),
974+
for &goal in goals.iter() {
975+
let source = match goal.predicate.kind().skip_binder() {
976+
ty::PredicateKind::Subtype { .. } | ty::PredicateKind::AliasRelate(..) => {
977+
GoalSource::TypeRelating
979978
}
980-
}
979+
// FIXME(-Znext-solver=coinductive): should these WF goals also be unproductive?
980+
ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(_)) => GoalSource::Misc,
981+
p => unreachable!("unexpected nested goal in `relate`: {p:?}"),
982+
};
983+
self.add_goal(source, goal);
981984
}
982-
self.add_goals(GoalSource::TypeRelating, goals);
983985
Ok(())
984986
}
985987

‎compiler/rustc_ty_utils/src/layout.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ fn layout_of_uncached<'tcx>(
611611
}
612612

613613
// Types with no meaningful known layout.
614-
ty::Param(_) => {
614+
ty::Param(_) | ty::Placeholder(..) => {
615615
return Err(error(cx, LayoutError::TooGeneric(ty)));
616616
}
617617

@@ -628,11 +628,7 @@ fn layout_of_uncached<'tcx>(
628628
return Err(error(cx, err));
629629
}
630630

631-
ty::Placeholder(..)
632-
| ty::Bound(..)
633-
| ty::CoroutineWitness(..)
634-
| ty::Infer(_)
635-
| ty::Error(_) => {
631+
ty::Bound(..) | ty::CoroutineWitness(..) | ty::Infer(_) | ty::Error(_) => {
636632
// `ty::Error` is handled at the top of this function.
637633
bug!("layout_of: unexpected type `{ty}`")
638634
}

‎tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.stderr‎ renamed to ‎tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.current.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
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
33
|
44
LL | impls(rigid);
55
| ^^^^^ cannot infer type of the type parameter `U` declared on the function `impls`
66
|
77
= note: cannot satisfy `for<'b> <P as Trait>::Rigid: Bound<'b, _>`
88
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
1010
|
1111
LL | fn impls<T: for<'b> Bound<'b, U>, U>(_: T) {}
1212
| ^^^^^^^^^^^^^^^^^^^^ required by this bound in `impls`

‎tests/ui/associated-type-bounds/dedup-normalized-2-higher-ranked.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
3+
//@[next] compile-flags: -Znext-solver
4+
//@[next] check-pass
5+
16
// We try to prove `for<'b> T::Rigid: Bound<'b, ?0>` and have 2 candidates from where-clauses:
27
//
38
// - `for<'a> Bound<'a, String>`
@@ -21,7 +26,7 @@ fn impls<T: for<'b> Bound<'b, U>, U>(_: T) {}
2126

2227
fn test<P: Trait>(rigid: P::Rigid) {
2328
impls(rigid);
24-
//~^ ERROR type annotations needed
29+
//[current]~^ ERROR type annotations needed
2530
}
2631

2732
fn main() {}

‎tests/ui/consts/too_generic_eval_ice.stderr‎ renamed to ‎tests/ui/consts/too_generic_eval_ice.current.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
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
33
|
44
LL | [5; Self::HOST_SIZE] == [6; 0]
55
| ^^^^^^^^^^^^^^^
66
|
77
= note: this may fail depending on what value the parameter takes
88

99
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
1111
|
1212
LL | [5; Self::HOST_SIZE] == [6; 0]
1313
| ^^^^^^^^^^^^^^^^^^^^
1414
|
1515
= note: this may fail depending on what value the parameter takes
1616

1717
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
1919
|
2020
LL | [5; Self::HOST_SIZE] == [6; 0]
2121
| ^^
2222
|
2323
= note: this may fail depending on what value the parameter takes
2424

2525
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
2727
|
2828
LL | [5; Self::HOST_SIZE] == [6; 0]
2929
| ^^ no implementation for `[{integer}; Self::HOST_SIZE] == [{integer}; 0]`

‎tests/ui/consts/too_generic_eval_ice.next.stderr‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0284]: type annotations needed: cannot satisfy `the constant `Self::HOST_SIZE` can be evaluated`
2+
--> $DIR/too_generic_eval_ice.rs:11:13
3+
|
4+
LL | [5; Self::HOST_SIZE] == [6; 0]
5+
| ^^^^^^^^^^^^^^^ cannot satisfy `the constant `Self::HOST_SIZE` can be evaluated`
6+
7+
error: aborting due to 1 previous error
8+
9+
For more information about this error, try `rustc --explain E0284`.

‎tests/ui/consts/too_generic_eval_ice.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
3+
//@[next] compile-flags: -Znext-solver
4+
15
pub struct Foo<A, B>(A, B);
26

37
impl<A, B> Foo<A, B> {
48
const HOST_SIZE: usize = std::mem::size_of::<B>();
59

610
pub fn crash() -> bool {
711
[5; Self::HOST_SIZE] == [6; 0]
8-
//~^ ERROR constant expression depends on a generic parameter
9-
//~| ERROR constant expression depends on a generic parameter
10-
//~| ERROR constant expression depends on a generic parameter
11-
//~| ERROR can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
12+
//[current]~^ ERROR constant expression depends on a generic parameter
13+
//[current]~| ERROR constant expression depends on a generic parameter
14+
//[current]~| ERROR constant expression depends on a generic parameter
15+
//[current]~| ERROR can't compare `[{integer}; Self::HOST_SIZE]` with `[{integer}; 0]`
16+
//[next]~^^^^^ ERROR type annotations needed
1217
}
1318
}
1419

‎tests/ui/privacy/where-pub-type-impls-priv-trait.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// priv-in-pub lint tests where the private trait bounds a public type
44

55
#![crate_type = "lib"]
6-
#![feature(generic_const_exprs)]
76
#![allow(incomplete_features)]
87

98
struct PrivTy;

‎tests/ui/privacy/where-pub-type-impls-priv-trait.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
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
33
|
44
LL | pub struct S
55
| ^^^^^^^^^^^^ struct `S` is reachable at visibility `pub`
66
|
77
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
99
|
1010
LL | trait PrivTr {}
1111
| ^^^^^^^^^^^^
1212
= note: `#[warn(private_bounds)]` on by default
1313

1414
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
1616
|
1717
LL | pub enum E
1818
| ^^^^^^^^^^ enum `E` is reachable at visibility `pub`
1919
|
2020
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
2222
|
2323
LL | trait PrivTr {}
2424
| ^^^^^^^^^^^^
2525

2626
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
2828
|
2929
LL | / pub fn f()
3030
LL | |
@@ -33,13 +33,13 @@ LL | | PubTy: PrivTr
3333
| |_________________^ function `f` is reachable at visibility `pub`
3434
|
3535
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
3737
|
3838
LL | trait PrivTr {}
3939
| ^^^^^^^^^^^^
4040

4141
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
4343
|
4444
LL | / impl S
4545
LL | |
@@ -48,13 +48,13 @@ LL | | PubTy: PrivTr
4848
| |_________________^ implementation `S` is reachable at visibility `pub`
4949
|
5050
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
5252
|
5353
LL | trait PrivTr {}
5454
| ^^^^^^^^^^^^
5555

5656
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
5858
|
5959
LL | / pub fn f()
6060
LL | |
@@ -63,7 +63,7 @@ LL | | PubTy: PrivTr
6363
| |_____________________^ associated function `S::f` is reachable at visibility `pub`
6464
|
6565
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
6767
|
6868
LL | trait PrivTr {}
6969
| ^^^^^^^^^^^^

‎tests/ui/traits/next-solver/well-formed-in-relate.rs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
fn main() {
2+
let x;
3+
//~^ ERROR type annotations needed for `Map<_, _>`
4+
higher_ranked();
5+
x = unconstrained_map();
6+
}
7+
8+
fn higher_ranked() where for<'a> &'a (): Sized {}
9+
10+
struct Map<T, U> where T: Fn() -> U {
11+
t: T,
12+
}
13+
14+
trait Mirror {
15+
type Assoc;
16+
}
17+
impl<T> Mirror for T {
18+
type Assoc = T;
19+
}
20+
21+
fn unconstrained_map<T: Fn() -> U, U>() -> <Map<T, U> as Mirror>::Assoc { todo!() }

0 commit comments

Comments
 (0)