Skip to content

Commit

Permalink
Update the .nll.stderr files under new sorted-by-span scheme.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pnkfelix
pnkfelix committed Jul 31, 2018
1 parent 2677685 commit faf841a
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 72 deletions.
18 changes: 9 additions & 9 deletions src/test/ui/hygiene/fields-move.nll.stderr
View file
@@ -1,27 +1,27 @@
error[E0382]: use of moved value: `foo.x`
--> $DIR/fields-move.rs:38:42
--> $DIR/fields-move.rs:28:9
|
LL | $foo.x
| ------ value moved here
...
LL | $foo.x //~ ERROR use of moved value: `foo.x`
| ^^^^^^ value used here after move
...
LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
| ^^^^^ value used here after move
| ----- value moved here
LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
| ----------------- in this macro invocation
|
= note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait

error[E0382]: use of moved value: `foo.x`
--> $DIR/fields-move.rs:28:9
--> $DIR/fields-move.rs:38:42
|
LL | $foo.x
| ------ value moved here
...
LL | $foo.x //~ ERROR use of moved value: `foo.x`
| ^^^^^^ value used here after move
...
LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
| ----- value moved here
LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved value: `foo.x`
| ----------------- in this macro invocation
| ^^^^^ value used here after move
|
= note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait

Expand Down
16 changes: 8 additions & 8 deletions src/test/ui/issue-27592.nll.stderr
View file
@@ -1,11 +1,3 @@
error[E0597]: borrowed value does not live long enough
--> $DIR/issue-27592.rs:26:33
|
LL | write(|| format_args!("{}", String::from("Hello world")));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here
| |
| temporary value does not live long enough

error[E0597]: borrowed value does not live long enough
--> $DIR/issue-27592.rs:26:27
|
Expand All @@ -14,6 +6,14 @@ LL | write(|| format_args!("{}", String::from("Hello world")));
| |
| temporary value does not live long enough

error[E0597]: borrowed value does not live long enough
--> $DIR/issue-27592.rs:26:33
|
LL | write(|| format_args!("{}", String::from("Hello world")));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here
| |
| temporary value does not live long enough

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0597`.
16 changes: 8 additions & 8 deletions src/test/ui/span/dropck_arr_cycle_checked.nll.stderr
View file
@@ -1,25 +1,25 @@
error[E0597]: `b3` does not live long enough
--> $DIR/dropck_arr_cycle_checked.rs:105:24
error[E0597]: `b2` does not live long enough
--> $DIR/dropck_arr_cycle_checked.rs:103:24
|
LL | b1.a[1].v.set(Some(&b3));
LL | b1.a[0].v.set(Some(&b2));
| ^^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `b3` dropped here while still borrowed
| `b2` dropped here while still borrowed
| borrow later used here, when `b1` is dropped

error[E0597]: `b2` does not live long enough
--> $DIR/dropck_arr_cycle_checked.rs:103:24
error[E0597]: `b3` does not live long enough
--> $DIR/dropck_arr_cycle_checked.rs:105:24
|
LL | b1.a[0].v.set(Some(&b2));
LL | b1.a[1].v.set(Some(&b3));
| ^^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `b2` dropped here while still borrowed
| `b3` dropped here while still borrowed
| borrow later used here, when `b1` is dropped

error[E0597]: `b1` does not live long enough
Expand Down
16 changes: 8 additions & 8 deletions src/test/ui/span/dropck_vec_cycle_checked.nll.stderr
View file
@@ -1,25 +1,25 @@
error[E0597]: `c3` does not live long enough
--> $DIR/dropck_vec_cycle_checked.rs:115:24
error[E0597]: `c2` does not live long enough
--> $DIR/dropck_vec_cycle_checked.rs:113:24
|
LL | c1.v[1].v.set(Some(&c3));
LL | c1.v[0].v.set(Some(&c2));
| ^^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `c3` dropped here while still borrowed
| `c2` dropped here while still borrowed
| borrow later used here, when `c1` is dropped

error[E0597]: `c2` does not live long enough
--> $DIR/dropck_vec_cycle_checked.rs:113:24
error[E0597]: `c3` does not live long enough
--> $DIR/dropck_vec_cycle_checked.rs:115:24
|
LL | c1.v[0].v.set(Some(&c2));
LL | c1.v[1].v.set(Some(&c3));
| ^^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `c2` dropped here while still borrowed
| `c3` dropped here while still borrowed
| borrow later used here, when `c1` is dropped

error[E0597]: `c1` does not live long enough
Expand Down
16 changes: 8 additions & 8 deletions src/test/ui/span/range-2.nll.stderr
View file
@@ -1,21 +1,21 @@
error[E0597]: `b` does not live long enough
--> $DIR/range-2.rs:17:13
error[E0597]: `a` does not live long enough
--> $DIR/range-2.rs:17:9
|
LL | &a..&b
| ^^ borrowed value does not live long enough
| ^^ borrowed value does not live long enough
LL | };
| - `b` dropped here while still borrowed
| - `a` dropped here while still borrowed
...
LL | r.use_ref();
| - borrow later used here

error[E0597]: `a` does not live long enough
--> $DIR/range-2.rs:17:9
error[E0597]: `b` does not live long enough
--> $DIR/range-2.rs:17:13
|
LL | &a..&b
| ^^ borrowed value does not live long enough
| ^^ borrowed value does not live long enough
LL | };
| - `a` dropped here while still borrowed
| - `b` dropped here while still borrowed
...
LL | r.use_ref();
| - borrow later used here
Expand Down
22 changes: 11 additions & 11 deletions src/test/ui/span/regions-escape-loop-via-vec.nll.stderr
View file
Expand Up @@ -20,6 +20,17 @@ LL | let mut z = x; //~ ERROR cannot use `x` because it was mutably borr
LL | _y.push(&mut z);
| -- borrow later used here

error[E0597]: `z` does not live long enough
--> $DIR/regions-escape-loop-via-vec.rs:17:17
|
LL | _y.push(&mut z);
| -- ^^^^^^ borrowed value does not live long enough
| |
| borrow later used here
...
LL | }
| - `z` dropped here while still borrowed

error[E0503]: cannot use `x` because it was mutably borrowed
--> $DIR/regions-escape-loop-via-vec.rs:19:9
|
Expand All @@ -32,17 +43,6 @@ LL | //~^ ERROR `z` does not live long enough
LL | x += 1; //~ ERROR cannot assign
| ^^^^^^ use of borrowed `x`

error[E0597]: `z` does not live long enough
--> $DIR/regions-escape-loop-via-vec.rs:17:17
|
LL | _y.push(&mut z);
| -- ^^^^^^ borrowed value does not live long enough
| |
| borrow later used here
...
LL | }
| - `z` dropped here while still borrowed

error: aborting due to 4 previous errors

Some errors occurred: E0503, E0597.
Expand Down
24 changes: 12 additions & 12 deletions src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr
View file
@@ -1,3 +1,15 @@
error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-ensures-scoping.rs:26:17
|
LL | let y = &x;
| ^^ borrowed value does not live long enough
...
LL | };
| - `x` dropped here while still borrowed
LL |
LL | bad.join();
| --- borrow later used here

error[E0597]: `y` does not live long enough
--> $DIR/send-is-not-static-ensures-scoping.rs:29:16
|
Expand All @@ -13,18 +25,6 @@ LL |
LL | bad.join();
| --- borrow later used here

error[E0597]: `x` does not live long enough
--> $DIR/send-is-not-static-ensures-scoping.rs:26:17
|
LL | let y = &x;
| ^^ borrowed value does not live long enough
...
LL | };
| - `x` dropped here while still borrowed
LL |
LL | bad.join();
| --- borrow later used here

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0597`.
16 changes: 8 additions & 8 deletions src/test/ui/span/vec_refs_data_with_early_death.nll.stderr
View file
@@ -1,27 +1,27 @@
error[E0597]: `y` does not live long enough
--> $DIR/vec_refs_data_with_early_death.rs:29:12
error[E0597]: `x` does not live long enough
--> $DIR/vec_refs_data_with_early_death.rs:27:12
|
LL | v.push(&y);
LL | v.push(&x);
| ^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `y` dropped here while still borrowed
| `x` dropped here while still borrowed
| borrow later used here, when `v` is dropped
|
= note: values in a scope are dropped in the opposite order they are defined

error[E0597]: `x` does not live long enough
--> $DIR/vec_refs_data_with_early_death.rs:27:12
error[E0597]: `y` does not live long enough
--> $DIR/vec_refs_data_with_early_death.rs:29:12
|
LL | v.push(&x);
LL | v.push(&y);
| ^^ borrowed value does not live long enough
...
LL | }
| -
| |
| `x` dropped here while still borrowed
| `y` dropped here while still borrowed
| borrow later used here, when `v` is dropped
|
= note: values in a scope are dropped in the opposite order they are defined
Expand Down

0 comments on commit faf841a

Please sign in to comment.