Skip to content

Commit faf841a

Browse files
pnkfelixpnkfelix
committed
Update the .nll.stderr files under new sorted-by-span scheme.
1 parent 2677685 commit faf841a

8 files changed

+72
-72
lines changed

‎src/test/ui/hygiene/fields-move.nll.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
error[E0382]: use of moved value: `foo.x`
2-
--> $DIR/fields-move.rs:38:42
2+
--> $DIR/fields-move.rs:28:9
33
|
44
LL | $foo.x
55
| ------ value moved here
66
...
7+
LL | $foo.x //~ ERROR use of moved value: `foo.x`
8+
| ^^^^^^ value used here after move
9+
...
710
LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
8-
| ^^^^^ value used here after move
11+
| ----- value moved here
12+
LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
13+
| ----------------- in this macro invocation
914
|
1015
= note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait
1116

1217
error[E0382]: use of moved value: `foo.x`
13-
--> $DIR/fields-move.rs:28:9
18+
--> $DIR/fields-move.rs:38:42
1419
|
1520
LL | $foo.x
1621
| ------ value moved here
1722
...
18-
LL | $foo.x //~ ERROR use of moved value: `foo.x`
19-
| ^^^^^^ value used here after move
20-
...
2123
LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
22-
| ----- value moved here
23-
LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
24-
| ----------------- in this macro invocation
24+
| ^^^^^ value used here after move
2525
|
2626
= note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait
2727

‎src/test/ui/issue-27592.nll.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
error[E0597]: borrowed value does not live long enough
2-
--> $DIR/issue-27592.rs:26:33
3-
|
4-
LL | write(|| format_args!("{}", String::from("Hello world")));
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here
6-
| |
7-
| temporary value does not live long enough
8-
91
error[E0597]: borrowed value does not live long enough
102
--> $DIR/issue-27592.rs:26:27
113
|
@@ -14,6 +6,14 @@ LL | write(|| format_args!("{}", String::from("Hello world")));
146
| |
157
| temporary value does not live long enough
168

9+
error[E0597]: borrowed value does not live long enough
10+
--> $DIR/issue-27592.rs:26:33
11+
|
12+
LL | write(|| format_args!("{}", String::from("Hello world")));
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here
14+
| |
15+
| temporary value does not live long enough
16+
1717
error: aborting due to 2 previous errors
1818

1919
For more information about this error, try `rustc --explain E0597`.

‎src/test/ui/span/dropck_arr_cycle_checked.nll.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
error[E0597]: `b3` does not live long enough
2-
--> $DIR/dropck_arr_cycle_checked.rs:105:24
1+
error[E0597]: `b2` does not live long enough
2+
--> $DIR/dropck_arr_cycle_checked.rs:103:24
33
|
4-
LL | b1.a[1].v.set(Some(&b3));
4+
LL | b1.a[0].v.set(Some(&b2));
55
| ^^^ borrowed value does not live long enough
66
...
77
LL | }
88
| -
99
| |
10-
| `b3` dropped here while still borrowed
10+
| `b2` dropped here while still borrowed
1111
| borrow later used here, when `b1` is dropped
1212

13-
error[E0597]: `b2` does not live long enough
14-
--> $DIR/dropck_arr_cycle_checked.rs:103:24
13+
error[E0597]: `b3` does not live long enough
14+
--> $DIR/dropck_arr_cycle_checked.rs:105:24
1515
|
16-
LL | b1.a[0].v.set(Some(&b2));
16+
LL | b1.a[1].v.set(Some(&b3));
1717
| ^^^ borrowed value does not live long enough
1818
...
1919
LL | }
2020
| -
2121
| |
22-
| `b2` dropped here while still borrowed
22+
| `b3` dropped here while still borrowed
2323
| borrow later used here, when `b1` is dropped
2424

2525
error[E0597]: `b1` does not live long enough

‎src/test/ui/span/dropck_vec_cycle_checked.nll.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
error[E0597]: `c3` does not live long enough
2-
--> $DIR/dropck_vec_cycle_checked.rs:115:24
1+
error[E0597]: `c2` does not live long enough
2+
--> $DIR/dropck_vec_cycle_checked.rs:113:24
33
|
4-
LL | c1.v[1].v.set(Some(&c3));
4+
LL | c1.v[0].v.set(Some(&c2));
55
| ^^^ borrowed value does not live long enough
66
...
77
LL | }
88
| -
99
| |
10-
| `c3` dropped here while still borrowed
10+
| `c2` dropped here while still borrowed
1111
| borrow later used here, when `c1` is dropped
1212

13-
error[E0597]: `c2` does not live long enough
14-
--> $DIR/dropck_vec_cycle_checked.rs:113:24
13+
error[E0597]: `c3` does not live long enough
14+
--> $DIR/dropck_vec_cycle_checked.rs:115:24
1515
|
16-
LL | c1.v[0].v.set(Some(&c2));
16+
LL | c1.v[1].v.set(Some(&c3));
1717
| ^^^ borrowed value does not live long enough
1818
...
1919
LL | }
2020
| -
2121
| |
22-
| `c2` dropped here while still borrowed
22+
| `c3` dropped here while still borrowed
2323
| borrow later used here, when `c1` is dropped
2424

2525
error[E0597]: `c1` does not live long enough

‎src/test/ui/span/range-2.nll.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
error[E0597]: `b` does not live long enough
2-
--> $DIR/range-2.rs:17:13
1+
error[E0597]: `a` does not live long enough
2+
--> $DIR/range-2.rs:17:9
33
|
44
LL | &a..&b
5-
| ^^ borrowed value does not live long enough
5+
| ^^ borrowed value does not live long enough
66
LL | };
7-
| - `b` dropped here while still borrowed
7+
| - `a` dropped here while still borrowed
88
...
99
LL | r.use_ref();
1010
| - borrow later used here
1111

12-
error[E0597]: `a` does not live long enough
13-
--> $DIR/range-2.rs:17:9
12+
error[E0597]: `b` does not live long enough
13+
--> $DIR/range-2.rs:17:13
1414
|
1515
LL | &a..&b
16-
| ^^ borrowed value does not live long enough
16+
| ^^ borrowed value does not live long enough
1717
LL | };
18-
| - `a` dropped here while still borrowed
18+
| - `b` dropped here while still borrowed
1919
...
2020
LL | r.use_ref();
2121
| - borrow later used here

‎src/test/ui/span/regions-escape-loop-via-vec.nll.stderr

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ LL | let mut z = x; //~ ERROR cannot use `x` because it was mutably borr
2020
LL | _y.push(&mut z);
2121
| -- borrow later used here
2222

23+
error[E0597]: `z` does not live long enough
24+
--> $DIR/regions-escape-loop-via-vec.rs:17:17
25+
|
26+
LL | _y.push(&mut z);
27+
| -- ^^^^^^ borrowed value does not live long enough
28+
| |
29+
| borrow later used here
30+
...
31+
LL | }
32+
| - `z` dropped here while still borrowed
33+
2334
error[E0503]: cannot use `x` because it was mutably borrowed
2435
--> $DIR/regions-escape-loop-via-vec.rs:19:9
2536
|
@@ -32,17 +43,6 @@ LL | //~^ ERROR `z` does not live long enough
3243
LL | x += 1; //~ ERROR cannot assign
3344
| ^^^^^^ use of borrowed `x`
3445

35-
error[E0597]: `z` does not live long enough
36-
--> $DIR/regions-escape-loop-via-vec.rs:17:17
37-
|
38-
LL | _y.push(&mut z);
39-
| -- ^^^^^^ borrowed value does not live long enough
40-
| |
41-
| borrow later used here
42-
...
43-
LL | }
44-
| - `z` dropped here while still borrowed
45-
4646
error: aborting due to 4 previous errors
4747

4848
Some errors occurred: E0503, E0597.

‎src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
error[E0597]: `x` does not live long enough
2+
--> $DIR/send-is-not-static-ensures-scoping.rs:26:17
3+
|
4+
LL | let y = &x;
5+
| ^^ borrowed value does not live long enough
6+
...
7+
LL | };
8+
| - `x` dropped here while still borrowed
9+
LL |
10+
LL | bad.join();
11+
| --- borrow later used here
12+
113
error[E0597]: `y` does not live long enough
214
--> $DIR/send-is-not-static-ensures-scoping.rs:29:16
315
|
@@ -13,18 +25,6 @@ LL |
1325
LL | bad.join();
1426
| --- borrow later used here
1527

16-
error[E0597]: `x` does not live long enough
17-
--> $DIR/send-is-not-static-ensures-scoping.rs:26:17
18-
|
19-
LL | let y = &x;
20-
| ^^ borrowed value does not live long enough
21-
...
22-
LL | };
23-
| - `x` dropped here while still borrowed
24-
LL |
25-
LL | bad.join();
26-
| --- borrow later used here
27-
2828
error: aborting due to 2 previous errors
2929

3030
For more information about this error, try `rustc --explain E0597`.

‎src/test/ui/span/vec_refs_data_with_early_death.nll.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
error[E0597]: `y` does not live long enough
2-
--> $DIR/vec_refs_data_with_early_death.rs:29:12
1+
error[E0597]: `x` does not live long enough
2+
--> $DIR/vec_refs_data_with_early_death.rs:27:12
33
|
4-
LL | v.push(&y);
4+
LL | v.push(&x);
55
| ^^ borrowed value does not live long enough
66
...
77
LL | }
88
| -
99
| |
10-
| `y` dropped here while still borrowed
10+
| `x` dropped here while still borrowed
1111
| borrow later used here, when `v` is dropped
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

15-
error[E0597]: `x` does not live long enough
16-
--> $DIR/vec_refs_data_with_early_death.rs:27:12
15+
error[E0597]: `y` does not live long enough
16+
--> $DIR/vec_refs_data_with_early_death.rs:29:12
1717
|
18-
LL | v.push(&x);
18+
LL | v.push(&y);
1919
| ^^ borrowed value does not live long enough
2020
...
2121
LL | }
2222
| -
2323
| |
24-
| `x` dropped here while still borrowed
24+
| `y` dropped here while still borrowed
2525
| borrow later used here, when `v` is dropped
2626
|
2727
= note: values in a scope are dropped in the opposite order they are defined

0 commit comments

Comments
 (0)