diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-07-03 11:38:09 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-07-04 05:09:33 -0400 |
| commit | 727f01700b074181bddf49caa07ac5e34455680d (patch) | |
| tree | a41db880441da4f99cdc24306f02950d3fc05d0a /src/test/compile-fail | |
| parent | fa02d68eecbb3ff253c4e6f2f7dcc171c7c25283 (diff) | |
| download | rust-727f01700b074181bddf49caa07ac5e34455680d.tar.gz rust-727f01700b074181bddf49caa07ac5e34455680d.zip | |
write code to extract region names and emit new style message
Diffstat (limited to 'src/test/compile-fail')
6 files changed, 6 insertions, 7 deletions
diff --git a/src/test/compile-fail/borrowck/borrowck-describe-lvalue.rs b/src/test/compile-fail/borrowck/borrowck-describe-lvalue.rs index 3a7e4a13740..b821c7cfa34 100644 --- a/src/test/compile-fail/borrowck/borrowck-describe-lvalue.rs +++ b/src/test/compile-fail/borrowck/borrowck-describe-lvalue.rs @@ -302,7 +302,7 @@ fn main() { // FIXME(#49824) -- the free region error below should probably not be there let mut x = 0; || { - || { //[mir]~ ERROR free region `` does not outlive + || { //[mir]~ ERROR unsatisfied lifetime constraints let y = &mut x; &mut x; //[ast]~ ERROR cannot borrow `**x` as mutable more than once at a time //[mir]~^ ERROR cannot borrow `x` as mutable more than once at a time diff --git a/src/test/compile-fail/mir_check_cast_closure.rs b/src/test/compile-fail/mir_check_cast_closure.rs index d8f5956b585..2200c1569e5 100644 --- a/src/test/compile-fail/mir_check_cast_closure.rs +++ b/src/test/compile-fail/mir_check_cast_closure.rs @@ -14,7 +14,7 @@ fn bar<'a, 'b>() -> fn(&'a u32, &'b u32) -> &'a u32 { let g: fn(_, _) -> _ = |_x, y| y; - //~^ ERROR free region `'b` does not outlive free region `'a` + //~^ ERROR unsatisfied lifetime constraints g //~^ WARNING not reporting region error due to nll } diff --git a/src/test/compile-fail/mir_check_cast_reify.rs b/src/test/compile-fail/mir_check_cast_reify.rs index 1f9174b3574..f85104dff86 100644 --- a/src/test/compile-fail/mir_check_cast_reify.rs +++ b/src/test/compile-fail/mir_check_cast_reify.rs @@ -45,7 +45,7 @@ fn bar<'a>(x: &'a u32) -> &'static u32 { // as part of checking the `ReifyFnPointer`. let f: fn(_) -> _ = foo; //~^ WARNING not reporting region error due to nll - //~| ERROR free region `'a` does not outlive free region `'static` + //~| ERROR unsatisfied lifetime constraints f(x) } diff --git a/src/test/compile-fail/mir_check_cast_unsafe_fn.rs b/src/test/compile-fail/mir_check_cast_unsafe_fn.rs index 27ca2728ddf..e90242f3f87 100644 --- a/src/test/compile-fail/mir_check_cast_unsafe_fn.rs +++ b/src/test/compile-fail/mir_check_cast_unsafe_fn.rs @@ -17,7 +17,7 @@ fn bar<'a>(input: &'a u32, f: fn(&'a u32) -> &'a u32) -> &'static u32 { // in `g`. These are related via the `UnsafeFnPointer` cast. let g: unsafe fn(_) -> _ = f; //~^ WARNING not reporting region error due to nll - //~| ERROR free region `'a` does not outlive free region `'static` + //~| ERROR unsatisfied lifetime constraints unsafe { g(input) } } diff --git a/src/test/compile-fail/mir_check_cast_unsize.rs b/src/test/compile-fail/mir_check_cast_unsize.rs index a2c840a7098..d242186a6f7 100644 --- a/src/test/compile-fail/mir_check_cast_unsize.rs +++ b/src/test/compile-fail/mir_check_cast_unsize.rs @@ -15,8 +15,7 @@ use std::fmt::Debug; fn bar<'a>(x: &'a u32) -> &'static dyn Debug { - //~^ ERROR free region `'a` does not outlive free region `'static` - x + x //~ ERROR unsatisfied lifetime constraints //~^ WARNING not reporting region error due to nll } diff --git a/src/test/compile-fail/regions-static-bound.rs b/src/test/compile-fail/regions-static-bound.rs index a0097b9f6d7..0a37df4f0c7 100644 --- a/src/test/compile-fail/regions-static-bound.rs +++ b/src/test/compile-fail/regions-static-bound.rs @@ -18,7 +18,7 @@ fn static_id_indirect<'a,'b>(t: &'a ()) -> &'static () fn static_id_wrong_way<'a>(t: &'a ()) -> &'static () where 'static: 'a { t //[ll]~ ERROR E0312 //[nll]~^ WARNING not reporting region error due to nll - //[nll]~| ERROR free region `'a` does not outlive free region `'static` + //[nll]~| ERROR unsatisfied lifetime constraints } fn error(u: &(), v: &()) { |