diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-07-31 14:36:50 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-07-31 14:36:50 +0200 |
| commit | 26776858cfaf2a46643ea0655fc0a2f4bf362df9 (patch) | |
| tree | 21b492383ddb892143510dfa61a6f1769426a690 /src | |
| parent | 6787e25c29c8282bcc9c61e887baec83e41a9834 (diff) | |
| download | rust-26776858cfaf2a46643ea0655fc0a2f4bf362df9.tar.gz rust-26776858cfaf2a46643ea0655fc0a2f4bf362df9.zip | |
Update tests that use `-Z borrowck=compare` or `#[feature(nll)]` to accmmodate diagnostic change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/borrowck/issue-41962.stderr | 34 | ||||
| -rw-r--r-- | src/test/ui/borrowck/two-phase-multi-mut.stderr | 16 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/test/ui/borrowck/issue-41962.stderr b/src/test/ui/borrowck/issue-41962.stderr index 4048243acfa..b6e005a6673 100644 --- a/src/test/ui/borrowck/issue-41962.stderr +++ b/src/test/ui/borrowck/issue-41962.stderr @@ -17,41 +17,41 @@ LL | if let Some(thing) = maybe { = note: move occurs because the value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait error[E0382]: use of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:30 + --> $DIR/issue-41962.rs:17:16 | LL | if let Some(thing) = maybe { - | ----- ^^^^^ value used here after move - | | - | value moved here + | ^^^^^-----^ + | | | + | | value moved here + | value used here after move | = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait -error[E0382]: borrow of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:30 +error[E0382]: use of moved value (Mir) + --> $DIR/issue-41962.rs:17:21 | LL | if let Some(thing) = maybe { - | ----- ^^^^^ value borrowed here after move - | | - | value moved here + | ^^^^^ value moved here in previous iteration of loop | = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait error[E0382]: use of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:16 + --> $DIR/issue-41962.rs:17:30 | LL | if let Some(thing) = maybe { - | ^^^^^-----^ - | | | - | | value moved here - | value used here after move + | ----- ^^^^^ value used here after move + | | + | value moved here | = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait -error[E0382]: use of moved value (Mir) - --> $DIR/issue-41962.rs:17:21 +error[E0382]: borrow of moved value: `maybe` (Mir) + --> $DIR/issue-41962.rs:17:30 | LL | if let Some(thing) = maybe { - | ^^^^^ value moved here in previous iteration of loop + | ----- ^^^^^ value borrowed here after move + | | + | value moved here | = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait diff --git a/src/test/ui/borrowck/two-phase-multi-mut.stderr b/src/test/ui/borrowck/two-phase-multi-mut.stderr index 0c02acf6548..a7e1dd95364 100644 --- a/src/test/ui/borrowck/two-phase-multi-mut.stderr +++ b/src/test/ui/borrowck/two-phase-multi-mut.stderr @@ -1,21 +1,21 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/two-phase-multi-mut.rs:23:16 + --> $DIR/two-phase-multi-mut.rs:23:5 | LL | foo.method(&mut foo); - | -----------^^^^^^^^- + | ^^^^^^^^^^^--------^ | | | - | | second mutable borrow occurs here - | first mutable borrow occurs here + | | first mutable borrow occurs here + | second mutable borrow occurs here | borrow later used here error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/two-phase-multi-mut.rs:23:5 + --> $DIR/two-phase-multi-mut.rs:23:16 | LL | foo.method(&mut foo); - | ^^^^^^^^^^^--------^ + | -----------^^^^^^^^- | | | - | | first mutable borrow occurs here - | second mutable borrow occurs here + | | second mutable borrow occurs here + | first mutable borrow occurs here | borrow later used here error: aborting due to 2 previous errors |