diff options
| author | David Wood <david@davidtw.co> | 2018-06-30 00:10:00 +0100 |
|---|---|---|
| committer | David Wood <david@davidtw.co> | 2018-07-01 16:14:26 +0100 |
| commit | c0c4741ef794d707a4378ace1547e8a41961016a (patch) | |
| tree | 670e7729d4afbd9a3968b767ede5527c21bd0ef0 | |
| parent | 15aad8356083e6098f7e8aefa1293b68201ec43c (diff) | |
| download | rust-c0c4741ef794d707a4378ace1547e8a41961016a.tar.gz rust-c0c4741ef794d707a4378ace1547e8a41961016a.zip | |
Updated affected tests after rebase.
6 files changed, 7 insertions, 7 deletions
diff --git a/src/test/ui/borrowck/issue-45983.nll.stderr b/src/test/ui/borrowck/issue-45983.nll.stderr index a62d81c0333..a008a408d97 100644 --- a/src/test/ui/borrowck/issue-45983.nll.stderr +++ b/src/test/ui/borrowck/issue-45983.nll.stderr @@ -4,7 +4,7 @@ warning: not reporting region error due to nll LL | give_any(|y| x = Some(y)); | ^ -error: assignment requires that data must outlive free region `'_#2r` +error: free region `` does not outlive free region `'_#2r` --> $DIR/issue-45983.rs:17:27 | LL | give_any(|y| x = Some(y)); diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr index 7a4db0802a8..ee3970aa8fd 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr +++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr @@ -4,7 +4,7 @@ warning: not reporting region error due to nll LL | with_int(|y| x = Some(y)); | ^ -error: assignment requires that data must outlive free region `'_#2r` +error: free region `` does not outlive free region `'_#2r` --> $DIR/regions-escape-bound-fn-2.rs:18:27 | LL | with_int(|y| x = Some(y)); 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 582417b0da9..40f215619c6 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 @@ -32,7 +32,7 @@ LL | | LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to nll LL | | }); - | |_____^ + | |______^ note: No external requirements --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:44:1 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 481ba512972..d89ff028a50 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 @@ -32,7 +32,7 @@ LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) LL | | //~^ WARNING not reporting region error due to nll LL | | }); - | |_____^ + | |______^ note: No external requirements --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:47:1 diff --git a/src/test/ui/nll/issue-50716.rs b/src/test/ui/nll/issue-50716.rs index 310600aaf9a..a41af168c3e 100644 --- a/src/test/ui/nll/issue-50716.rs +++ b/src/test/ui/nll/issue-50716.rs @@ -22,7 +22,7 @@ where for<'b> &'b T: A, <&'static T as A>::X: Sized { - let _x = *s; //~ ERROR free region `'a` does not outlive free region `'static` + let _x = *s; //~ ERROR assignment requires that data must outlive free region `'static` } fn main() {} diff --git a/src/test/ui/nll/issue-50716.stderr b/src/test/ui/nll/issue-50716.stderr index 20b03d648d9..de69f8cfbcb 100644 --- a/src/test/ui/nll/issue-50716.stderr +++ b/src/test/ui/nll/issue-50716.stderr @@ -1,7 +1,7 @@ -error: free region `'a` does not outlive free region `'static` +error: assignment requires that data must outlive free region `'static` --> $DIR/issue-50716.rs:25:14 | -LL | let _x = *s; //~ ERROR free region `'a` does not outlive free region `'static` +LL | let _x = *s; //~ ERROR assignment requires that data must outlive free region `'static` | ^^ error: aborting due to previous error |