Skip to content

Commit c150d04

Browse files
committed
rebase, bless tests
1 parent be70e89 commit c150d04

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

tests/ui/lazy-type-alias/inherent-impls-overflow.classic.stderr renamed to tests/ui/lazy-type-alias/inherent-impls-overflow.current.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
error[E0275]: overflow evaluating the requirement `Loop`
1+
error[E0275]: overflow normalizing the type alias `Loop`
22
--> $DIR/inherent-impls-overflow.rs:7:13
33
|
44
LL | type Loop = Loop;
55
| ^^^^
66
|
77
= note: in case this is a recursive type alias, consider using a struct, enum, or union instead
88

9-
error[E0275]: overflow evaluating the requirement `Loop`
10-
--> $DIR/inherent-impls-overflow.rs:9:1
9+
error[E0275]: overflow normalizing the type alias `Loop`
10+
--> $DIR/inherent-impls-overflow.rs:10:1
1111
|
1212
LL | impl Loop {}
1313
| ^^^^^^^^^^^^
1414
|
1515
= note: in case this is a recursive type alias, consider using a struct, enum, or union instead
1616

17-
error[E0275]: overflow evaluating the requirement `Poly0<((((((...,),),),),),)>`
18-
--> $DIR/inherent-impls-overflow.rs:11:17
17+
error[E0275]: overflow normalizing the type alias `Poly0<(((((((...,),),),),),),)>`
18+
--> $DIR/inherent-impls-overflow.rs:14:17
1919
|
2020
LL | type Poly0<T> = Poly1<(T,)>;
2121
| ^^^^^^^^^^^
2222
|
2323
= note: in case this is a recursive type alias, consider using a struct, enum, or union instead
2424

25-
error[E0275]: overflow evaluating the requirement `Poly1<((((((...,),),),),),)>`
26-
--> $DIR/inherent-impls-overflow.rs:14:17
25+
error[E0275]: overflow normalizing the type alias `Poly1<(((((((...,),),),),),),)>`
26+
--> $DIR/inherent-impls-overflow.rs:17:17
2727
|
2828
LL | type Poly1<T> = Poly0<(T,)>;
2929
| ^^^^^^^^^^^
3030
|
3131
= note: in case this is a recursive type alias, consider using a struct, enum, or union instead
3232

33-
error[E0275]: overflow evaluating the requirement `Poly1<((((((...,),),),),),)>`
34-
--> $DIR/inherent-impls-overflow.rs:18:1
33+
error[E0275]: overflow normalizing the type alias `Poly1<(((((((...,),),),),),),)>`
34+
--> $DIR/inherent-impls-overflow.rs:21:1
3535
|
3636
LL | impl Poly0<()> {}
3737
| ^^^^^^^^^^^^^^^^^

tests/ui/lazy-type-alias/inherent-impls-overflow.next.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0275]: overflow evaluating the requirement `Loop == _`
2-
--> $DIR/inherent-impls-overflow.rs:9:6
2+
--> $DIR/inherent-impls-overflow.rs:10:6
33
|
44
LL | impl Loop {}
55
| ^^^^
66
|
77
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`inherent_impls_overflow`)
88

99
error[E0392]: type parameter `T` is never used
10-
--> $DIR/inherent-impls-overflow.rs:11:12
10+
--> $DIR/inherent-impls-overflow.rs:14:12
1111
|
1212
LL | type Poly0<T> = Poly1<(T,)>;
1313
| ^ unused type parameter
@@ -16,7 +16,7 @@ LL | type Poly0<T> = Poly1<(T,)>;
1616
= help: if you intended `T` to be a const parameter, use `const T: /* Type */` instead
1717

1818
error[E0392]: type parameter `T` is never used
19-
--> $DIR/inherent-impls-overflow.rs:14:12
19+
--> $DIR/inherent-impls-overflow.rs:17:12
2020
|
2121
LL | type Poly1<T> = Poly0<(T,)>;
2222
| ^ unused type parameter
@@ -25,7 +25,7 @@ LL | type Poly1<T> = Poly0<(T,)>;
2525
= help: if you intended `T` to be a const parameter, use `const T: /* Type */` instead
2626

2727
error[E0275]: overflow evaluating the requirement `Poly0<()> == _`
28-
--> $DIR/inherent-impls-overflow.rs:18:6
28+
--> $DIR/inherent-impls-overflow.rs:21:6
2929
|
3030
LL | impl Poly0<()> {}
3131
| ^^^^^^^^^
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
//@ revisions: classic next
1+
//@ revisions: current next
22
//@[next] compile-flags: -Znext-solver
33

44
#![feature(lazy_type_alias)]
55
#![allow(incomplete_features)]
66

7-
type Loop = Loop; //[classic]~ ERROR overflow evaluating the requirement
7+
type Loop = Loop;
8+
//[current]~^ ERROR overflow normalizing the type alias
89

9-
impl Loop {} //~ ERROR overflow evaluating the requirement
10+
impl Loop {}
11+
//[current]~^ ERROR overflow normalizing the type alias
12+
//[next]~^^ ERROR overflow evaluating the requirement
1013

1114
type Poly0<T> = Poly1<(T,)>;
12-
//[classic]~^ ERROR overflow evaluating the requirement
15+
//[current]~^ ERROR overflow normalizing the type alias
1316
//[next]~^^ ERROR type parameter `T` is never used
1417
type Poly1<T> = Poly0<(T,)>;
15-
//[classic]~^ ERROR overflow evaluating the requirement
18+
//[current]~^ ERROR overflow normalizing the type alias
1619
//[next]~^^ ERROR type parameter `T` is never used
1720

18-
impl Poly0<()> {} //~ ERROR overflow evaluating the requirement
21+
impl Poly0<()> {}
22+
//[current]~^ ERROR overflow normalizing the type alias
23+
//[next]~^^ ERROR overflow evaluating the requirement
1924

2025
fn main() {}

0 commit comments

Comments
 (0)