Skip to content

Commit 0498da3

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#65777 - matthewjasper:allow-impl-trait-expansion, r=davidtwco
Don't ICE for completely unexpandable `impl Trait` types Save the resolution of these types (to themselves) to the typeck tables so that they will eventually reach E0720. closes rust-lang#65561
2 parents 3cf7f5a + 0c05ed2 commit 0498da3

7 files changed

+48
-28
lines changed

‎src/librustc_typeck/check/writeback.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,12 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
479479
let mut skip_add = false;
480480

481481
if let ty::Opaque(defin_ty_def_id, _substs) = definition_ty.kind {
482-
if def_id == defin_ty_def_id {
483-
debug!("Skipping adding concrete definition for opaque type {:?} {:?}",
484-
opaque_defn, defin_ty_def_id);
485-
skip_add = true;
482+
if let hir::OpaqueTyOrigin::TypeAlias = opaque_defn.origin {
483+
if def_id == defin_ty_def_id {
484+
debug!("Skipping adding concrete definition for opaque type {:?} {:?}",
485+
opaque_defn, defin_ty_def_id);
486+
skip_add = true;
487+
}
486488
}
487489
}
488490

‎src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Test that an `impl Trait` type that expands to itself is an error.
2+
3+
fn test() -> impl Sized { //~ ERROR E0720
4+
test()
5+
}
6+
7+
fn main() {}

‎src/test/ui/impl-trait/recursive-impl-trait-type-direct.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0720]: opaque type expands to a recursive type
2+
--> $DIR/recursive-impl-trait-type-direct.rs:3:14
3+
|
4+
LL | fn test() -> impl Sized {
5+
| ^^^^^^^^^^ expands to a recursive type
6+
|
7+
= note: type resolves to itself
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0720`.

‎src/test/ui/impl-trait/recursive-impl-trait-type.rs ‎src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs

File renamed without changes.

‎src/test/ui/impl-trait/recursive-impl-trait-type.stderr ‎src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,109 @@
11
error[E0720]: opaque type expands to a recursive type
2-
--> $DIR/recursive-impl-trait-type.rs:6:22
2+
--> $DIR/recursive-impl-trait-type-indirect.rs:6:22
33
|
44
LL | fn option(i: i32) -> impl Sized {
55
| ^^^^^^^^^^ expands to a recursive type
66
|
77
= note: expanded type is `std::option::Option<(impl Sized, i32)>`
88

99
error[E0720]: opaque type expands to a recursive type
10-
--> $DIR/recursive-impl-trait-type.rs:14:15
10+
--> $DIR/recursive-impl-trait-type-indirect.rs:14:15
1111
|
1212
LL | fn tuple() -> impl Sized {
1313
| ^^^^^^^^^^ expands to a recursive type
1414
|
1515
= note: expanded type is `(impl Sized,)`
1616

1717
error[E0720]: opaque type expands to a recursive type
18-
--> $DIR/recursive-impl-trait-type.rs:18:15
18+
--> $DIR/recursive-impl-trait-type-indirect.rs:18:15
1919
|
2020
LL | fn array() -> impl Sized {
2121
| ^^^^^^^^^^ expands to a recursive type
2222
|
2323
= note: expanded type is `[impl Sized; 1]`
2424

2525
error[E0720]: opaque type expands to a recursive type
26-
--> $DIR/recursive-impl-trait-type.rs:22:13
26+
--> $DIR/recursive-impl-trait-type-indirect.rs:22:13
2727
|
2828
LL | fn ptr() -> impl Sized {
2929
| ^^^^^^^^^^ expands to a recursive type
3030
|
3131
= note: expanded type is `*const impl Sized`
3232

3333
error[E0720]: opaque type expands to a recursive type
34-
--> $DIR/recursive-impl-trait-type.rs:26:16
34+
--> $DIR/recursive-impl-trait-type-indirect.rs:26:16
3535
|
3636
LL | fn fn_ptr() -> impl Sized {
3737
| ^^^^^^^^^^ expands to a recursive type
3838
|
3939
= note: expanded type is `fn() -> impl Sized`
4040

4141
error[E0720]: opaque type expands to a recursive type
42-
--> $DIR/recursive-impl-trait-type.rs:30:25
42+
--> $DIR/recursive-impl-trait-type-indirect.rs:30:25
4343
|
4444
LL | fn closure_capture() -> impl Sized {
4545
| ^^^^^^^^^^ expands to a recursive type
4646
|
47-
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:32:5: 32:19 x:impl Sized]`
47+
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:32:5: 32:19 x:impl Sized]`
4848

4949
error[E0720]: opaque type expands to a recursive type
50-
--> $DIR/recursive-impl-trait-type.rs:35:29
50+
--> $DIR/recursive-impl-trait-type-indirect.rs:35:29
5151
|
5252
LL | fn closure_ref_capture() -> impl Sized {
5353
| ^^^^^^^^^^ expands to a recursive type
5454
|
55-
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:37:5: 37:20 x:impl Sized]`
55+
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:37:5: 37:20 x:impl Sized]`
5656

5757
error[E0720]: opaque type expands to a recursive type
58-
--> $DIR/recursive-impl-trait-type.rs:40:21
58+
--> $DIR/recursive-impl-trait-type-indirect.rs:40:21
5959
|
6060
LL | fn closure_sig() -> impl Sized {
6161
| ^^^^^^^^^^ expands to a recursive type
6262
|
63-
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:41:5: 41:21]`
63+
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:41:5: 41:21]`
6464

6565
error[E0720]: opaque type expands to a recursive type
66-
--> $DIR/recursive-impl-trait-type.rs:44:23
66+
--> $DIR/recursive-impl-trait-type-indirect.rs:44:23
6767
|
6868
LL | fn generator_sig() -> impl Sized {
6969
| ^^^^^^^^^^ expands to a recursive type
7070
|
71-
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:45:5: 45:23]`
71+
= note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:45:5: 45:23]`
7272

7373
error[E0720]: opaque type expands to a recursive type
74-
--> $DIR/recursive-impl-trait-type.rs:48:27
74+
--> $DIR/recursive-impl-trait-type-indirect.rs:48:27
7575
|
7676
LL | fn generator_capture() -> impl Sized {
7777
| ^^^^^^^^^^ expands to a recursive type
7878
|
79-
= note: expanded type is `[generator@$DIR/recursive-impl-trait-type.rs:50:5: 50:26 x:impl Sized {()}]`
79+
= note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:50:5: 50:26 x:impl Sized {()}]`
8080

8181
error[E0720]: opaque type expands to a recursive type
82-
--> $DIR/recursive-impl-trait-type.rs:53:26
82+
--> $DIR/recursive-impl-trait-type-indirect.rs:53:26
8383
|
8484
LL | fn substs_change<T>() -> impl Sized {
8585
| ^^^^^^^^^^ expands to a recursive type
8686
|
8787
= note: expanded type is `(impl Sized,)`
8888

8989
error[E0720]: opaque type expands to a recursive type
90-
--> $DIR/recursive-impl-trait-type.rs:57:24
90+
--> $DIR/recursive-impl-trait-type-indirect.rs:57:24
9191
|
9292
LL | fn generator_hold() -> impl Sized {
9393
| ^^^^^^^^^^ expands to a recursive type
9494
|
95-
= note: expanded type is `[generator@$DIR/recursive-impl-trait-type.rs:58:5: 62:6 {impl Sized, ()}]`
95+
= note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:58:5: 62:6 {impl Sized, ()}]`
9696

9797
error[E0720]: opaque type expands to a recursive type
98-
--> $DIR/recursive-impl-trait-type.rs:69:26
98+
--> $DIR/recursive-impl-trait-type-indirect.rs:69:26
9999
|
100100
LL | fn mutual_recursion() -> impl Sync {
101101
| ^^^^^^^^^ expands to a recursive type
102102
|
103103
= note: type resolves to itself
104104

105105
error[E0720]: opaque type expands to a recursive type
106-
--> $DIR/recursive-impl-trait-type.rs:73:28
106+
--> $DIR/recursive-impl-trait-type-indirect.rs:73:28
107107
|
108108
LL | fn mutual_recursion_b() -> impl Sized {
109109
| ^^^^^^^^^^ expands to a recursive type

‎src/test/ui/impl-trait/recursive-impl-trait-type--through-non-recursize.rs ‎src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs

File renamed without changes.

‎src/test/ui/impl-trait/recursive-impl-trait-type--through-non-recursize.stderr ‎src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error[E0720]: opaque type expands to a recursive type
2-
--> $DIR/recursive-impl-trait-type--through-non-recursize.rs:7:22
2+
--> $DIR/recursive-impl-trait-type-through-non-recursive.rs:7:22
33
|
44
LL | fn recursive_id() -> impl Sized {
55
| ^^^^^^^^^^ expands to a recursive type
66
|
77
= note: type resolves to itself
88

99
error[E0720]: opaque type expands to a recursive type
10-
--> $DIR/recursive-impl-trait-type--through-non-recursize.rs:11:23
10+
--> $DIR/recursive-impl-trait-type-through-non-recursive.rs:11:23
1111
|
1212
LL | fn recursive_id2() -> impl Sized {
1313
| ^^^^^^^^^^ expands to a recursive type
1414
|
1515
= note: type resolves to itself
1616

1717
error[E0720]: opaque type expands to a recursive type
18-
--> $DIR/recursive-impl-trait-type--through-non-recursize.rs:17:24
18+
--> $DIR/recursive-impl-trait-type-through-non-recursive.rs:17:24
1919
|
2020
LL | fn recursive_wrap() -> impl Sized {
2121
| ^^^^^^^^^^ expands to a recursive type
2222
|
2323
= note: expanded type is `((impl Sized,),)`
2424

2525
error[E0720]: opaque type expands to a recursive type
26-
--> $DIR/recursive-impl-trait-type--through-non-recursize.rs:21:25
26+
--> $DIR/recursive-impl-trait-type-through-non-recursive.rs:21:25
2727
|
2828
LL | fn recursive_wrap2() -> impl Sized {
2929
| ^^^^^^^^^^ expands to a recursive type

0 commit comments

Comments
 (0)