about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMatthew Jasper <mjjasper1@gmail.com>2018-08-06 21:42:26 +0100
committerMatthew Jasper <mjjasper1@gmail.com>2018-08-06 21:42:26 +0100
commitb13e3f87709031be5c599ff23d73f981d04416fd (patch)
treeaaec718bdcff412f4d3c38bd35bfd642118fe72f /src/test
parentf72b8a44c51313d384deefcda753df668f2e265e (diff)
downloadrust-b13e3f87709031be5c599ff23d73f981d04416fd.tar.gz
rust-b13e3f87709031be5c599ff23d73f981d04416fd.zip
Name return type in free region messages
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr8
-rw-r--r--src/test/ui/issue-40510-1.nll.stderr4
-rw-r--r--src/test/ui/issue-40510-3.nll.stderr4
-rw-r--r--src/test/ui/issue-49824.nll.stderr4
-rw-r--r--src/test/ui/nll/issue-48238.stderr4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
index 27a51cb83fb..3f9104373d6 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
@@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:26
    |
 LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
-   |                ------    ^^^^^ requires that `'1` must outlive `'2`
-   |                |   |
-   |                |   has type `&'1 i32`
-   |                lifetime `'2` appears in return type
+   |                    --    ^^^^^ requires that `'1` must outlive `'2`
+   |                    ||
+   |                    |return type of closure is &'2 i32
+   |                    has type `&'1 i32`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issue-40510-1.nll.stderr b/src/test/ui/issue-40510-1.nll.stderr
index 7eb6a0e7fb2..6c77bcb2757 100644
--- a/src/test/ui/issue-40510-1.nll.stderr
+++ b/src/test/ui/issue-40510-1.nll.stderr
@@ -3,9 +3,9 @@ error: unsatisfied lifetime constraints
    |
 LL |     || {
    |     --
-   |     |
+   |     ||
+   |     |return type of closure is &'2 mut std::boxed::Box<()>
    |     lifetime `'1` represents this closure's body
-   |     lifetime `'2` appears in return type
 LL |         &mut x
    |         ^^^^^^ return requires that `'1` must outlive `'2`
    |
diff --git a/src/test/ui/issue-40510-3.nll.stderr b/src/test/ui/issue-40510-3.nll.stderr
index ae3ae3a27ab..8aeef86c2e8 100644
--- a/src/test/ui/issue-40510-3.nll.stderr
+++ b/src/test/ui/issue-40510-3.nll.stderr
@@ -3,9 +3,9 @@ error: unsatisfied lifetime constraints
    |
 LL |       || {
    |       --
-   |       |
+   |       ||
+   |       |return type of closure is [closure@$DIR/issue-40510-3.rs:18:9: 20:10 x:&'2 mut std::vec::Vec<()>]
    |       lifetime `'1` represents this closure's body
-   |       lifetime `'2` appears in return type
 LL | /         || {
 LL | |             x.push(())
 LL | |         }
diff --git a/src/test/ui/issue-49824.nll.stderr b/src/test/ui/issue-49824.nll.stderr
index 432036c9d90..fb4bed76a71 100644
--- a/src/test/ui/issue-49824.nll.stderr
+++ b/src/test/ui/issue-49824.nll.stderr
@@ -3,9 +3,9 @@ error: unsatisfied lifetime constraints
    |
 LL |       || {
    |       --
-   |       |
+   |       ||
+   |       |return type of closure is [closure@$DIR/issue-49824.rs:22:9: 24:10 x:&'2 mut i32]
    |       lifetime `'1` represents this closure's body
-   |       lifetime `'2` appears in return type
 LL | /         || {
 LL | |             let _y = &mut x;
 LL | |         }
diff --git a/src/test/ui/nll/issue-48238.stderr b/src/test/ui/nll/issue-48238.stderr
index 4baa9044424..84d0730025a 100644
--- a/src/test/ui/nll/issue-48238.stderr
+++ b/src/test/ui/nll/issue-48238.stderr
@@ -3,9 +3,9 @@ error: unsatisfied lifetime constraints
    |
 LL |     move || use_val(&orig); //~ ERROR
    |     ------- ^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2`
-   |     |
+   |     |     |
+   |     |     return type of closure is &'2 u8
    |     lifetime `'1` represents this closure's body
-   |     lifetime `'2` appears in return type
    |
    = note: closure implements `Fn`, so references to captured variables can't escape the closure