diff options
| author | Tommy Ip <hkmp7tommy@gmail.com> | 2017-12-10 21:12:28 +0000 |
|---|---|---|
| committer | Tommy Ip <hkmp7tommy@gmail.com> | 2017-12-10 21:14:57 +0000 |
| commit | 2ad5bf056c88283613cec925e4d025c4d4b89c55 (patch) | |
| tree | b55748832c30162f37d7e4da77f433f97d4f00ea /src/test/ui/nll | |
| parent | 76d9b309aeee9615f3049e7bf95083bdee4ebe01 (diff) | |
| download | rust-2ad5bf056c88283613cec925e4d025c4d4b89c55.tar.gz rust-2ad5bf056c88283613cec925e4d025c4d4b89c55.zip | |
Update ui tests' line numbers.
Diffstat (limited to 'src/test/ui/nll')
5 files changed, 71 insertions, 71 deletions
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr index 7553ac5b0c3..81eb90020cc 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to -Znll - --> $DIR/propagate-approximated-ref.rs:60:9 + --> $DIR/propagate-approximated-ref.rs:61:9 | -60 | demand_y(x, y, x.get()) +61 | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-ref.rs:58:47 + --> $DIR/propagate-approximated-ref.rs:59:47 | -58 | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { +59 | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | _______________________________________________^ -59 | | // Only works if 'x: 'y: -60 | | demand_y(x, y, x.get()) -61 | | }); +60 | | // Only works if 'x: 'y: +61 | | demand_y(x, y, x.get()) +62 | | }); | |_____^ | = note: defining type: DefId(0/1:18 ~ propagate_approximated_ref[317d]::supply[0]::{{closure}}[0]) with closure substs [ @@ -22,14 +22,14 @@ note: External requirements = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-approximated-ref.rs:57:1 + --> $DIR/propagate-approximated-ref.rs:58:1 | -57 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { -58 | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { -59 | | // Only works if 'x: 'y: -60 | | demand_y(x, y, x.get()) -61 | | }); -62 | | } +58 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { +59 | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { +60 | | // Only works if 'x: 'y: +61 | | demand_y(x, y, x.get()) +62 | | }); +63 | | } | |_^ | = note: defining type: DefId(0/0:6 ~ propagate_approximated_ref[317d]::supply[0]) with substs [] diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr index 8d1b9a94ea6..8fd6acbbe5d 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to -Znll - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:47:9 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:48:9 | -47 | demand_y(x, y, x.get()) +48 | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:47 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:46:47 | -45 | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { +46 | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { | _______________________________________________^ -46 | | // Only works if 'x: 'y: -47 | | demand_y(x, y, x.get()) -48 | | }); +47 | | // Only works if 'x: 'y: +48 | | demand_y(x, y, x.get()) +49 | | }); | |_____^ | = note: defining type: DefId(0/1:18 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [ @@ -22,14 +22,14 @@ note: External requirements = note: where '_#1r: '_#0r note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:44:1 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:1 | -44 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { -45 | | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { -46 | | // Only works if 'x: 'y: -47 | | demand_y(x, y, x.get()) -48 | | }); -49 | | } +45 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { +46 | | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { +47 | | // Only works if 'x: 'y: +48 | | demand_y(x, y, x.get()) +49 | | }); +50 | | } | |_^ | = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs [] diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr index 9d318a63d8f..f189967244a 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to -Znll - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:50:9 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:51:9 | -50 | demand_y(x, y, x.get()) +51 | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:47 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:49:47 | -48 | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { +49 | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | _______________________________________________^ -49 | | // Only works if 'x: 'y: -50 | | demand_y(x, y, x.get()) -51 | | }); +50 | | // Only works if 'x: 'y: +51 | | demand_y(x, y, x.get()) +52 | | }); | |_____^ | = note: defining type: DefId(0/1:18 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [ @@ -22,14 +22,14 @@ note: External requirements = note: where '_#1r: '_#0r note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:47:1 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:1 | -47 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { -48 | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { -49 | | // Only works if 'x: 'y: -50 | | demand_y(x, y, x.get()) -51 | | }); -52 | | } +48 | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { +49 | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { +50 | | // Only works if 'x: 'y: +51 | | demand_y(x, y, x.get()) +52 | | }); +53 | | } | |_^ | = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs [] diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr index ae5ad6f4b96..1577e34e0de 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to -Znll - --> $DIR/propagate-approximated-val.rs:48:9 + --> $DIR/propagate-approximated-val.rs:49:9 | -48 | demand_y(outlives1, outlives2, x.get()) +49 | demand_y(outlives1, outlives2, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-val.rs:46:45 + --> $DIR/propagate-approximated-val.rs:47:45 | -46 | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { +47 | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { | _____________________________________________^ -47 | | // Only works if 'x: 'y: -48 | | demand_y(outlives1, outlives2, x.get()) -49 | | }); +48 | | // Only works if 'x: 'y: +49 | | demand_y(outlives1, outlives2, x.get()) +50 | | }); | |_____^ | = note: defining type: DefId(0/1:18 ~ propagate_approximated_val[317d]::test[0]::{{closure}}[0]) with closure substs [ @@ -22,14 +22,14 @@ note: External requirements = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-approximated-val.rs:45:1 + --> $DIR/propagate-approximated-val.rs:46:1 | -45 | / fn test<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { -46 | | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { -47 | | // Only works if 'x: 'y: -48 | | demand_y(outlives1, outlives2, x.get()) -49 | | }); -50 | | } +46 | / fn test<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { +47 | | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { +48 | | // Only works if 'x: 'y: +49 | | demand_y(outlives1, outlives2, x.get()) +50 | | }); +51 | | } | |_^ | = note: defining type: DefId(0/0:6 ~ propagate_approximated_val[317d]::test[0]) with substs [] diff --git a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr index 64f3bb08c62..d93124963eb 100644 --- a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to -Znll - --> $DIR/propagate-despite-same-free-region.rs:53:21 + --> $DIR/propagate-despite-same-free-region.rs:54:21 | -53 | let p = x.get(); +54 | let p = x.get(); | ^^^^^^^ note: External requirements - --> $DIR/propagate-despite-same-free-region.rs:51:9 + --> $DIR/propagate-despite-same-free-region.rs:52:9 | -51 | / |_outlives1, _outlives2, x, y| { -52 | | // Only works if 'x: 'y: -53 | | let p = x.get(); -54 | | demand_y(x, y, p) -55 | | }, +52 | / |_outlives1, _outlives2, x, y| { +53 | | // Only works if 'x: 'y: +54 | | let p = x.get(); +55 | | demand_y(x, y, p) +56 | | }, | |_________^ | = note: defining type: DefId(0/1:16 ~ propagate_despite_same_free_region[317d]::supply[0]::{{closure}}[0]) with closure substs [ @@ -22,15 +22,15 @@ note: External requirements = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-despite-same-free-region.rs:48:1 + --> $DIR/propagate-despite-same-free-region.rs:49:1 | -48 | / fn supply<'a>(cell_a: Cell<&'a u32>) { -49 | | establish_relationships( -50 | | cell_a, -51 | | |_outlives1, _outlives2, x, y| { +49 | / fn supply<'a>(cell_a: Cell<&'a u32>) { +50 | | establish_relationships( +51 | | cell_a, +52 | | |_outlives1, _outlives2, x, y| { ... | -56 | | ); -57 | | } +57 | | ); +58 | | } | |_^ | = note: defining type: DefId(0/0:6 ~ propagate_despite_same_free_region[317d]::supply[0]) with substs [] |
