forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#126730 - oli-obk:opaque_type_diff_next_solver, r=lcnr Add opaque type corner case test r? ``@lcnr`` I can't make sense of the new solver tracing logs yet, so I just added the test without explanation. The old solver does not yet figure out that `Foo == ()` from the where bounds. Unfortunately, even if we make it understand that, it will later try to prove `<X as Trait<'static>>::Out<Foo>: Sized` via the `is_sized_raw` query, which does not take a list of defineable opaque types, causing that check to fail with an ICE. Thus I'm submitting this test case on its own just to ensure we handle it correctly in the future with any new solver or old solver changes.
- Loading branch information
Showing
4 changed files
with
81 additions
and
5 deletions.
There are no files selected for viewing
9 changes: 9 additions & 0 deletions
9
...trait-bounds/normalize-under-binder/norm-before-method-resolution-opaque-type.next.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
error[E0284]: type annotations needed: cannot satisfy `Foo == _` | ||
--> $DIR/norm-before-method-resolution-opaque-type.rs:16:19 | ||
| | ||
LL | fn weird_bound<X>(x: &<X as Trait<'static>>::Out<Foo>) -> X | ||
| ^ cannot satisfy `Foo == _` | ||
|
||
error: aborting due to 1 previous error | ||
|
||
For more information about this error, try `rustc --explain E0284`. |
36 changes: 36 additions & 0 deletions
36
.../trait-bounds/normalize-under-binder/norm-before-method-resolution-opaque-type.old.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
error: item does not constrain `Foo::{opaque#0}`, but has it in its signature | ||
--> $DIR/norm-before-method-resolution-opaque-type.rs:16:4 | ||
| | ||
LL | fn weird_bound<X>(x: &<X as Trait<'static>>::Out<Foo>) -> X | ||
| ^^^^^^^^^^^ | ||
| | ||
= note: consider moving the opaque type's declaration and defining uses into a separate module | ||
note: this opaque type is in the signature | ||
--> $DIR/norm-before-method-resolution-opaque-type.rs:13:12 | ||
| | ||
LL | type Foo = impl Sized; | ||
| ^^^^^^^^^^ | ||
|
||
error: unconstrained opaque type | ||
--> $DIR/norm-before-method-resolution-opaque-type.rs:13:12 | ||
| | ||
LL | type Foo = impl Sized; | ||
| ^^^^^^^^^^ | ||
| | ||
= note: `Foo` must be used in combination with a concrete type within the same module | ||
|
||
error[E0507]: cannot move out of `*x` which is behind a shared reference | ||
--> $DIR/norm-before-method-resolution-opaque-type.rs:23:13 | ||
| | ||
LL | let x = *x; | ||
| ^^ move occurs because `*x` has type `<X as Trait<'_>>::Out<Foo>`, which does not implement the `Copy` trait | ||
| | ||
help: consider removing the dereference here | ||
| | ||
LL - let x = *x; | ||
LL + let x = x; | ||
| | ||
|
||
error: aborting due to 3 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0507`. |
29 changes: 29 additions & 0 deletions
29
...r-ranked/trait-bounds/normalize-under-binder/norm-before-method-resolution-opaque-type.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
//@ revisions: old next | ||
//@[next] compile-flags: -Znext-solver | ||
|
||
#![feature(type_alias_impl_trait)] | ||
trait Trait<'a> { | ||
type Out<U>; | ||
} | ||
|
||
impl<'a, T> Trait<'a> for T { | ||
type Out<U> = T; | ||
} | ||
|
||
type Foo = impl Sized; | ||
//[old]~^ ERROR: unconstrained opaque type | ||
|
||
fn weird_bound<X>(x: &<X as Trait<'static>>::Out<Foo>) -> X | ||
//[old]~^ ERROR: item does not constrain | ||
//[next]~^^ ERROR: cannot satisfy `Foo == _` | ||
where | ||
for<'a> X: Trait<'a>, | ||
for<'a> <X as Trait<'a>>::Out<()>: Copy, | ||
{ | ||
let x = *x; //[old]~ ERROR: cannot move out of `*x` | ||
todo!(); | ||
} | ||
|
||
fn main() { | ||
let _: () = weird_bound(&()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters