diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-06 21:29:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 21:29:13 -0600 |
| commit | ec6bba319b90533964dec26b7e0832ca9a1acf87 (patch) | |
| tree | 1ef8a26c269472fcdf8f074dd09c78b49355cd52 /src/test/ui/span | |
| parent | b71b92199c5a04e41b10bcd09333ca8762933bdc (diff) | |
| parent | e7e8c72fdd0195358b4fe82f16fce81668ef0c3c (diff) | |
| download | rust-ec6bba319b90533964dec26b7e0832ca9a1acf87.tar.gz rust-ec6bba319b90533964dec26b7e0832ca9a1acf87.zip | |
Rollup merge of #52067 - csmoe:issue-51167, r=nikomatsakis
Visit the mir basic blocks in reverse-postfix order cc #51167 r? @nikomatsakis
Diffstat (limited to 'src/test/ui/span')
4 files changed, 28 insertions, 28 deletions
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr b/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr index fee0d7feb6d..cbb9d0429c6 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr +++ b/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr @@ -1,7 +1,7 @@ -error[E0597]: `b1` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:111:24 +error[E0597]: `b3` does not live long enough + --> $DIR/dropck_arr_cycle_checked.rs:105:24 | -LL | b3.a[0].v.set(Some(&b1)); +LL | b1.a[1].v.set(Some(&b3)); | ^^^ borrowed value does not live long enough ... LL | } @@ -22,10 +22,10 @@ LL | } | borrowed value only lives until here | borrow later used here, when `b1` is dropped -error[E0597]: `b3` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:105:24 +error[E0597]: `b1` does not live long enough + --> $DIR/dropck_arr_cycle_checked.rs:111:24 | -LL | b1.a[1].v.set(Some(&b3)); +LL | b3.a[0].v.set(Some(&b1)); | ^^^ borrowed value does not live long enough ... LL | } diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr index 86a4f0e13b5..37fffe886e3 100644 --- a/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr +++ b/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr @@ -1,9 +1,9 @@ -error[E0597]: `d1` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:48:19 +error[E0597]: `d2` does not live long enough + --> $DIR/dropck_direct_cycle_with_drop.rs:46:19 | -LL | d2.p.set(Some(&d1)); +LL | d1.p.set(Some(&d2)); | ^^^ borrowed value does not live long enough -LL | //~^ ERROR `d1` does not live long enough +... LL | } | - | | @@ -12,12 +12,12 @@ LL | } | = note: values in a scope are dropped in the opposite order they are defined -error[E0597]: `d2` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:46:19 +error[E0597]: `d1` does not live long enough + --> $DIR/dropck_direct_cycle_with_drop.rs:48:19 | -LL | d1.p.set(Some(&d2)); +LL | d2.p.set(Some(&d1)); | ^^^ borrowed value does not live long enough -... +LL | //~^ ERROR `d1` does not live long enough LL | } | - | | diff --git a/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr b/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr index b7f8b85f46c..13bd1f54198 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr +++ b/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr @@ -1,7 +1,7 @@ -error[E0597]: `c1` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:121:24 +error[E0597]: `c3` does not live long enough + --> $DIR/dropck_vec_cycle_checked.rs:115:24 | -LL | c3.v[0].v.set(Some(&c1)); +LL | c1.v[1].v.set(Some(&c3)); | ^^^ borrowed value does not live long enough ... LL | } @@ -22,10 +22,10 @@ LL | } | borrowed value only lives until here | borrow later used here, when `c1` is dropped -error[E0597]: `c3` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:115:24 +error[E0597]: `c1` does not live long enough + --> $DIR/dropck_vec_cycle_checked.rs:121:24 | -LL | c1.v[1].v.set(Some(&c3)); +LL | c3.v[0].v.set(Some(&c1)); | ^^^ borrowed value does not live long enough ... LL | } diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr index 389adb231c4..100b4c1292f 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr @@ -1,21 +1,21 @@ -error[E0597]: `c1` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:129:24 +error[E0597]: `c2` does not live long enough + --> $DIR/vec-must-not-hide-type-from-dropck.rs:127:24 | -LL | c2.v[0].v.set(Some(&c1)); +LL | c1.v[0].v.set(Some(&c2)); | ^^^ borrowed value does not live long enough -LL | //~^ ERROR `c1` does not live long enough +... LL | } | - | | | borrowed value only lives until here | borrow later used here, when `c1` is dropped -error[E0597]: `c2` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:127:24 +error[E0597]: `c1` does not live long enough + --> $DIR/vec-must-not-hide-type-from-dropck.rs:129:24 | -LL | c1.v[0].v.set(Some(&c2)); +LL | c2.v[0].v.set(Some(&c1)); | ^^^ borrowed value does not live long enough -... +LL | //~^ ERROR `c1` does not live long enough LL | } | - | | |