Auto merge of #109740 - compiler-errors:new-solver-deep-reject-placeholder-consts, r=lcnr

Don't ICE on placeholder consts in deep reject

Since we canonicalize const params into placeholder consts, we need to be able to handle them during deep reject.

r? `@lcnr` (though maybe `@oli-obk` can look at this one too, if he wants 😸)

Fixes compiler-errors/next-solver-hir-issues#10
This commit is contained in:
bors 2023-03-30 19:28:56 +00:00
commit ec2f40c6b0
3 changed files with 42 additions and 1 deletions

View File

@ -312,6 +312,7 @@ impl DeepRejectCtxt {
// Impls cannot contain these types as these cannot be named directly.
ty::FnDef(..) | ty::Closure(..) | ty::Generator(..) => false,
// Placeholder types don't unify with anything on their own
ty::Placeholder(..) | ty::Bound(..) => false,
// Depending on the value of `treat_obligation_params`, we either
@ -359,6 +360,9 @@ impl DeepRejectCtxt {
TreatParams::AsCandidateKey => true,
},
// Placeholder consts don't unify with anything on their own
ty::ConstKind::Placeholder(_) => false,
// As we don't necessarily eagerly evaluate constants,
// they might unify with any value.
ty::ConstKind::Expr(_) | ty::ConstKind::Unevaluated(_) | ty::ConstKind::Error(_) => {
@ -371,7 +375,7 @@ impl DeepRejectCtxt {
ty::ConstKind::Infer(_) => true,
ty::ConstKind::Bound(..) | ty::ConstKind::Placeholder(_) => {
ty::ConstKind::Bound(..) => {
bug!("unexpected obl const: {:?}", obligation_ct)
}
}

View File

@ -0,0 +1,16 @@
error[E0277]: the trait bound `[T; N]: Foo` is not satisfied
--> $DIR/const-param-placeholder.rs:17:17
|
LL | needs_foo::<[T; N]>();
| ^^^^^^ the trait `Foo` is not implemented for `[T; N]`
|
= help: the trait `Foo` is implemented for `[T; 1]`
note: required by a bound in `needs_foo`
--> $DIR/const-param-placeholder.rs:8:17
|
LL | fn needs_foo<F: Foo>() {}
| ^^^ required by this bound in `needs_foo`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0277`.

View File

@ -0,0 +1,21 @@
// compile-flags: -Ztrait-solver=next
// revisions: pass fail
//[pass] check-pass
struct Wrapper<T, const N: usize>([T; N]);
trait Foo {}
fn needs_foo<F: Foo>() {}
#[cfg(fail)]
impl<T> Foo for [T; 1] {}
#[cfg(pass)]
impl<T, const N: usize> Foo for [T; N] {}
fn test<T, const N: usize>() {
needs_foo::<[T; N]>();
//[fail]~^ ERROR the trait bound `[T; N]: Foo` is not satisfied
}
fn main() {}