Skip to content

Commit cd7ce71

Browse files
petrochenkovpetrochenkov
committed
Fix rebase
1 parent 48f95ae commit cd7ce71

16 files changed

+166
-166
lines changed

‎src/test/ui/error-codes/E0657.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
22
--> $DIR/E0657.rs:20:31
33
|
4-
LL | -> impl for<'a> Id<impl Lt<'a>>
5-
| ^^
4+
LL | -> Box<for<'a> Id<impl Lt<'a>>>
5+
| ^^
66

77
error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
88
--> $DIR/E0657.rs:29:35
99
|
10-
LL | -> impl for<'a> Id<impl Lt<'a>>
11-
| ^^
10+
LL | -> Box<for<'a> Id<impl Lt<'a>>>
11+
| ^^
1212

1313
error: aborting due to 2 previous errors
1414

‎src/test/ui/impl_trait_projections.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
error[E0667]: `impl Trait` is not allowed in path parameters
22
--> $DIR/impl_trait_projections.rs:23:51
33
|
4-
23 | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
4+
LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
55
| ^^^^^^^^^^^^^
66

77
error[E0667]: `impl Trait` is not allowed in path parameters
88
--> $DIR/impl_trait_projections.rs:30:9
99
|
10-
30 | -> <impl Iterator as Iterator>::Item
10+
LL | -> <impl Iterator as Iterator>::Item
1111
| ^^^^^^^^^^^^^
1212

1313
error[E0667]: `impl Trait` is not allowed in path parameters
1414
--> $DIR/impl_trait_projections.rs:37:27
1515
|
16-
37 | -> <::std::ops::Range<impl Debug> as Iterator>::Item
16+
LL | -> <::std::ops::Range<impl Debug> as Iterator>::Item
1717
| ^^^^^^^^^^
1818

1919
error[E0667]: `impl Trait` is not allowed in path parameters
2020
--> $DIR/impl_trait_projections.rs:44:29
2121
|
22-
44 | -> <dyn Iterator<Item = impl Debug> as Iterator>::Item
22+
LL | -> <dyn Iterator<Item = impl Debug> as Iterator>::Item
2323
| ^^^^^^^^^^
2424

2525
error[E0223]: ambiguous associated type
2626
--> $DIR/impl_trait_projections.rs:23:50
2727
|
28-
23 | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
28+
LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
2929
| ^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type
3030
|
3131
= note: specify the type using the syntax `<impl std::iter::Iterator as Trait>::Item`

‎src/test/ui/issue-23302-1.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0391]: cyclic dependency detected
22
--> $DIR/issue-23302-1.rs:14:9
33
|
4-
14 | A = X::A as isize, //~ ERROR E0391
4+
LL | A = X::A as isize, //~ ERROR E0391
55
| ^^^^^^^^^^^^^ cyclic reference
66
|
77
note: the cycle begins when const-evaluating `X::A::{{initializer}}`...
88
--> $DIR/issue-23302-1.rs:14:5
99
|
10-
14 | A = X::A as isize, //~ ERROR E0391
10+
LL | A = X::A as isize, //~ ERROR E0391
1111
| ^^^^^^^^^^^^^^^^^
1212
= note: ...which then again requires const-evaluating `X::A::{{initializer}}`, completing the cycle.
1313

‎src/test/ui/issue-23302-2.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0391]: cyclic dependency detected
22
--> $DIR/issue-23302-2.rs:14:9
33
|
4-
14 | A = Y::B as isize, //~ ERROR E0391
4+
LL | A = Y::B as isize, //~ ERROR E0391
55
| ^^^^^^^^^^^^^ cyclic reference
66
|
77
note: the cycle begins when const-evaluating `Y::A::{{initializer}}`...
88
--> $DIR/issue-23302-2.rs:14:5
99
|
10-
14 | A = Y::B as isize, //~ ERROR E0391
10+
LL | A = Y::B as isize, //~ ERROR E0391
1111
| ^^^^^^^^^^^^^^^^^
1212
= note: ...which then again requires const-evaluating `Y::A::{{initializer}}`, completing the cycle.
1313

‎src/test/ui/issue-23302-3.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
error[E0391]: cyclic dependency detected
22
--> $DIR/issue-23302-3.rs:11:16
33
|
4-
11 | const A: i32 = B; //~ ERROR E0391
4+
LL | const A: i32 = B; //~ ERROR E0391
55
| ^ cyclic reference
66
|
77
note: the cycle begins when processing `B`...
88
--> $DIR/issue-23302-3.rs:13:1
99
|
10-
13 | const B: i32 = A;
10+
LL | const B: i32 = A;
1111
| ^^^^^^^^^^^^^^^^^
1212
note: ...which then requires processing `A`...
1313
--> $DIR/issue-23302-3.rs:13:16
1414
|
15-
13 | const B: i32 = A;
15+
LL | const B: i32 = A;
1616
| ^
1717
= note: ...which then again requires processing `B`, completing the cycle.
1818

‎src/test/ui/issue-36163.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error[E0265]: recursive constant
2-
--> $DIR/issue-36163.rs:11:1
3-
|
4-
LL | const A: i32 = Foo::B; //~ ERROR E0265
5-
| ^^^^^^^^^^^^^^^^^^^^^^ recursion not allowed in constant
6-
7-
error[E0265]: recursive constant
1+
error[E0391]: cyclic dependency detected
82
--> $DIR/issue-36163.rs:14:9
93
|
10-
LL | B = A, //~ ERROR E0265
11-
| ^ recursion not allowed in constant
12-
13-
error[E0265]: recursive constant
14-
--> $DIR/issue-36163.rs:18:9
4+
LL | B = A, //~ ERROR E0391
5+
| ^ cyclic reference
6+
|
7+
note: the cycle begins when const-evaluating `Foo::B::{{initializer}}`...
8+
--> $DIR/issue-36163.rs:14:5
9+
|
10+
LL | B = A, //~ ERROR E0391
11+
| ^^^^^
12+
note: ...which then requires const-evaluating `A`...
13+
--> $DIR/issue-36163.rs:14:9
1514
|
16-
LL | C = Bar::C, //~ ERROR E0265
17-
| ^^^^^^ recursion not allowed in constant
15+
LL | B = A, //~ ERROR E0391
16+
| ^
17+
= note: ...which then again requires const-evaluating `Foo::B::{{initializer}}`, completing the cycle.
1818

1919
error: aborting due to previous error
2020

‎src/test/ui/issue-47706.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ LL | self.foo.map(Foo::new)
1010
error[E0593]: function is expected to take 0 arguments, but it takes 1 argument
1111
--> $DIR/issue-47706.rs:37:5
1212
|
13-
27 | Bar(i32),
13+
LL | Bar(i32),
1414
| -------- takes 1 argument
1515
...
16-
37 | foo(Qux::Bar);
16+
LL | foo(Qux::Bar);
1717
| ^^^ expected function that takes 0 arguments
1818
|
1919
note: required by `foo`
2020
--> $DIR/issue-47706.rs:30:1
2121
|
22-
30 | / fn foo<F>(f: F)
23-
31 | | where
24-
32 | | F: Fn(),
25-
33 | | {
26-
34 | | }
22+
LL | / fn foo<F>(f: F)
23+
LL | | where
24+
LL | | F: Fn(),
25+
LL | | {
26+
LL | | }
2727
| |_^
2828

2929
error: aborting due to 2 previous errors

‎src/test/ui/nested_impl_trait.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0666]: nested `impl Trait` is not allowed
22
--> $DIR/nested_impl_trait.rs:16:56
33
|
4-
16 | fn bad_in_ret_position(x: impl Into<u32>) -> impl Into<impl Debug> { x }
4+
LL | fn bad_in_ret_position(x: impl Into<u32>) -> impl Into<impl Debug> { x }
55
| ----------^^^^^^^^^^-
66
| | |
77
| | nested `impl Trait` here
@@ -10,7 +10,7 @@ error[E0666]: nested `impl Trait` is not allowed
1010
error[E0666]: nested `impl Trait` is not allowed
1111
--> $DIR/nested_impl_trait.rs:19:42
1212
|
13-
19 | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
13+
LL | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
1414
| ----------^^^^^^^^^^-
1515
| | |
1616
| | nested `impl Trait` here
@@ -19,7 +19,7 @@ error[E0666]: nested `impl Trait` is not allowed
1919
error[E0666]: nested `impl Trait` is not allowed
2020
--> $DIR/nested_impl_trait.rs:23:37
2121
|
22-
23 | fn bad_in_arg_position(_: impl Into<impl Debug>) { }
22+
LL | fn bad_in_arg_position(_: impl Into<impl Debug>) { }
2323
| ----------^^^^^^^^^^-
2424
| | |
2525
| | nested `impl Trait` here
@@ -28,7 +28,7 @@ error[E0666]: nested `impl Trait` is not allowed
2828
error[E0666]: nested `impl Trait` is not allowed
2929
--> $DIR/nested_impl_trait.rs:28:44
3030
|
31-
28 | fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
31+
LL | fn bad(x: impl Into<u32>) -> impl Into<impl Debug> { x }
3232
| ----------^^^^^^^^^^-
3333
| | |
3434
| | nested `impl Trait` here
@@ -37,13 +37,13 @@ error[E0666]: nested `impl Trait` is not allowed
3737
error[E0562]: `impl Trait` not allowed outside of function and inherent method return types
3838
--> $DIR/nested_impl_trait.rs:19:32
3939
|
40-
19 | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
40+
LL | fn bad_in_fn_syntax(x: fn() -> impl Into<impl Debug>) {}
4141
| ^^^^^^^^^^^^^^^^^^^^^
4242

4343
error[E0562]: `impl Trait` not allowed outside of function and inherent method return types
4444
--> $DIR/nested_impl_trait.rs:36:42
4545
|
46-
36 | fn allowed_in_ret_type() -> impl Fn() -> impl Into<u32> {
46+
LL | fn allowed_in_ret_type() -> impl Fn() -> impl Into<u32> {
4747
| ^^^^^^^^^^^^^^
4848

4949
error: aborting due to 6 previous errors

‎src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ LL | | }
5353
note: External requirements
5454
--> $DIR/projection-no-regions-closure.rs:46:23
5555
|
56-
46 | with_signature(x, |mut y| Box::new(y.next()))
56+
LL | with_signature(x, |mut y| Box::new(y.next()))
5757
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
5858
|
5959
= note: defining type: DefId(0/1:18 ~ projection_no_regions_closure[317d]::correct_region[0]::{{closure}}[0]) with closure substs [
@@ -84,7 +84,7 @@ LL | | }
8484
note: External requirements
8585
--> $DIR/projection-no-regions-closure.rs:54:23
8686
|
87-
54 | with_signature(x, |mut y| Box::new(y.next()))
87+
LL | with_signature(x, |mut y| Box::new(y.next()))
8888
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
8989
|
9090
= note: defining type: DefId(0/1:22 ~ projection_no_regions_closure[317d]::wrong_region[0]::{{closure}}[0]) with closure substs [
@@ -126,7 +126,7 @@ LL | | }
126126
note: External requirements
127127
--> $DIR/projection-no-regions-closure.rs:65:23
128128
|
129-
65 | with_signature(x, |mut y| Box::new(y.next()))
129+
LL | with_signature(x, |mut y| Box::new(y.next()))
130130
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
131131
|
132132
= note: defining type: DefId(0/1:26 ~ projection_no_regions_closure[317d]::outlives_region[0]::{{closure}}[0]) with closure substs [

‎src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr

+17-17
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ LL | | }
6666
note: External requirements
6767
--> $DIR/projection-one-region-closure.rs:68:29
6868
|
69-
68 | with_signature(cell, t, |cell, t| require(cell, t));
69+
LL | with_signature(cell, t, |cell, t| require(cell, t));
7070
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
7171
|
7272
= note: defining type: DefId(0/1:23 ~ projection_one_region_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
@@ -115,7 +115,7 @@ LL | | }
115115
note: External requirements
116116
--> $DIR/projection-one-region-closure.rs:90:29
117117
|
118-
90 | with_signature(cell, t, |cell, t| require(cell, t));
118+
LL | with_signature(cell, t, |cell, t| require(cell, t));
119119
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
120120
|
121121
= note: defining type: DefId(0/1:27 ~ projection_one_region_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
@@ -162,21 +162,21 @@ LL | | }
162162
]
163163

164164
note: External requirements
165-
--> $DIR/projection-one-region-closure.rs:103:29
166-
|
167-
103 | with_signature(cell, t, |cell, t| require(cell, t));
168-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
169-
|
170-
= note: defining type: DefId(0/1:31 ~ projection_one_region_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
171-
'_#1r,
172-
'_#2r,
173-
T,
174-
i32,
175-
extern "rust-call" fn((std::cell::Cell<&'_#3r ()>, T))
176-
]
177-
= note: number of external vids: 4
178-
= note: where T: '_#3r
179-
= note: where '_#2r: '_#3r
165+
--> $DIR/projection-one-region-closure.rs:103:29
166+
|
167+
LL | with_signature(cell, t, |cell, t| require(cell, t));
168+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
169+
|
170+
= note: defining type: DefId(0/1:31 ~ projection_one_region_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
171+
'_#1r,
172+
'_#2r,
173+
T,
174+
i32,
175+
extern "rust-call" fn((std::cell::Cell<&'_#3r ()>, T))
176+
]
177+
= note: number of external vids: 4
178+
= note: where T: '_#3r
179+
= note: where '_#2r: '_#3r
180180

181181
note: No external requirements
182182
--> $DIR/projection-one-region-closure.rs:97:1

‎src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LL | | }
5757
note: External requirements
5858
--> $DIR/projection-one-region-trait-bound-closure.rs:59:29
5959
|
60-
59 | with_signature(cell, t, |cell, t| require(cell, t));
60+
LL | with_signature(cell, t, |cell, t| require(cell, t));
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
6262
|
6363
= note: defining type: DefId(0/1:23 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
@@ -97,7 +97,7 @@ LL | | }
9797
note: External requirements
9898
--> $DIR/projection-one-region-trait-bound-closure.rs:80:29
9999
|
100-
80 | with_signature(cell, t, |cell, t| require(cell, t));
100+
LL | with_signature(cell, t, |cell, t| require(cell, t));
101101
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
102102
|
103103
= note: defining type: DefId(0/1:27 ~ projection_one_region_trait_bound_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
@@ -137,7 +137,7 @@ LL | | }
137137
note: External requirements
138138
--> $DIR/projection-one-region-trait-bound-closure.rs:91:29
139139
|
140-
91 | with_signature(cell, t, |cell, t| require(cell, t));
140+
LL | with_signature(cell, t, |cell, t| require(cell, t));
141141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
142142
|
143143
= note: defining type: DefId(0/1:31 ~ projection_one_region_trait_bound_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
@@ -169,19 +169,19 @@ LL | | }
169169
]
170170

171171
note: External requirements
172-
--> $DIR/projection-one-region-trait-bound-closure.rs:103:29
173-
|
174-
103 | with_signature(cell, t, |cell, t| require(cell, t));
175-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
176-
|
177-
= note: defining type: DefId(0/1:34 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
178-
'_#1r,
179-
T,
180-
i32,
181-
extern "rust-call" fn((std::cell::Cell<&'_#2r ()>, T))
182-
]
183-
= note: number of external vids: 3
184-
= note: where '_#1r: '_#2r
172+
--> $DIR/projection-one-region-trait-bound-closure.rs:103:29
173+
|
174+
LL | with_signature(cell, t, |cell, t| require(cell, t));
175+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
176+
|
177+
= note: defining type: DefId(0/1:34 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
178+
'_#1r,
179+
T,
180+
i32,
181+
extern "rust-call" fn((std::cell::Cell<&'_#2r ()>, T))
182+
]
183+
= note: number of external vids: 3
184+
= note: where '_#1r: '_#2r
185185

186186
note: No external requirements
187187
--> $DIR/projection-one-region-trait-bound-closure.rs:95:1

0 commit comments

Comments
 (0)