summary refs log tree commit diff
path: root/src/test/ui/object-lifetime
diff options
context:
space:
mode:
authorMatthew Jasper <mjjasper1@gmail.com>2018-09-15 18:30:29 +0100
committerMatthew Jasper <mjjasper1@gmail.com>2018-09-19 20:50:09 +0100
commitbd0895d7d011cc4c6bef4f95e6df64d2fee6ff73 (patch)
tree146b8e71049cc840d5a99f42d9f96da9882f53da /src/test/ui/object-lifetime
parent994dc4bd1ef01b45408750679d9ec46bc1c2ff33 (diff)
downloadrust-bd0895d7d011cc4c6bef4f95e6df64d2fee6ff73.tar.gz
rust-bd0895d7d011cc4c6bef4f95e6df64d2fee6ff73.zip
Update ui tests
Diffstat (limited to 'src/test/ui/object-lifetime')
-rw-r--r--src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr6
-rw-r--r--src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr
index e62b9b07021..a6bfcf1d369 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr
+++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr
@@ -1,10 +1,10 @@
-error: borrowed data escapes outside of function
+error: unsatisfied lifetime constraints
   --> $DIR/object-lifetime-default-from-rptr-box-error.rs:25:5
    |
 LL | fn c<'a>(t: &'a Box<Test+'a>, mut ss: SomeStruct<'a>) {
-   |          - `t` is a reference that is only valid in the function body
+   |      -- lifetime `'a` defined here
 LL |     ss.t = t; //~ ERROR mismatched types
-   |     ^^^^^^^^ `t` escapes the function body here
+   |     ^^^^^^^^ assignment requires that `'a` must outlive `'static`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr
index 803f9d3fd7e..396ff1302b1 100644
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr
+++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr
@@ -1,10 +1,10 @@
-error: borrowed data escapes outside of function
+error: unsatisfied lifetime constraints
   --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:31:5
    |
 LL | fn c<'a>(t: &'a MyBox<Test+'a>, mut ss: SomeStruct<'a>) {
-   |          - `t` is a reference that is only valid in the function body
+   |      -- lifetime `'a` defined here
 LL |     ss.t = t; //~ ERROR mismatched types
-   |     ^^^^^^^^ `t` escapes the function body here
+   |     ^^^^^^^^ assignment requires that `'a` must outlive `'static`
 
 error: aborting due to previous error