diff options
| author | David Wood <david@davidtw.co> | 2018-10-17 00:57:32 +0200 |
|---|---|---|
| committer | David Wood <david@davidtw.co> | 2018-10-17 00:57:32 +0200 |
| commit | 539404b77d1e443793c653ae03b207c62b3b1ae0 (patch) | |
| tree | 3c79f2fa470dd27c0bd24547b4ac221c1257eca0 /src/test/ui/error-codes | |
| parent | 8b34881e972906545d030318006478c1986fa0aa (diff) | |
| download | rust-539404b77d1e443793c653ae03b207c62b3b1ae0.tar.gz rust-539404b77d1e443793c653ae03b207c62b3b1ae0.zip | |
Update output for borrowck=migrate compare mode.
This commit updates the test output for the updated NLL compare mode that uses `-Z borrowck=migrate` rather than `-Z borrowck=mir`. The previous commit changes `compiletest` and this commit only updates `.nll.stderr` files.
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0507.nll.stderr | 18 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr | 11 |
2 files changed, 18 insertions, 11 deletions
diff --git a/src/test/ui/error-codes/E0507.nll.stderr b/src/test/ui/error-codes/E0507.nll.stderr new file mode 100644 index 00000000000..43795e5224d --- /dev/null +++ b/src/test/ui/error-codes/E0507.nll.stderr @@ -0,0 +1,18 @@ +error[E0507]: cannot move out of borrowed content + --> $DIR/E0507.rs:22:5 + | +LL | x.borrow().nothing_is_true(); //~ ERROR E0507 + | ^^^^^^^^^^ cannot move out of borrowed content + +error[E0507]: cannot move out of data in a `&` reference + --> $DIR/E0507.rs:22:5 + | +LL | x.borrow().nothing_is_true(); //~ ERROR E0507 + | ^^^^^^^^^^ + | | + | cannot move out of data in a `&` reference + | cannot move + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0507`. diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr deleted file mode 100644 index 65008380f9e..00000000000 --- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: unsatisfied lifetime constraints - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:45 - | -LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 - | -- ^ returning this value requires that `'1` must outlive `'2` - | || - | |return type of closure is &'2 i32 - | has type `&'1 i32` - -error: aborting due to previous error - |