about summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-08-08 12:48:32 +0000
committerbors <bors@rust-lang.org>2018-08-08 12:48:32 +0000
commit63fe441db8a441bc68c754c33a04f57f0f8a8b77 (patch)
tree2039c5acbf5b0eca0a47052debfe762e12eb79b6 /src/test/ui/error-codes
parentebe8df41d70d8763e0a15aefe078b035d3519214 (diff)
parentb13e3f87709031be5c599ff23d73f981d04416fd (diff)
downloadrust-63fe441db8a441bc68c754c33a04f57f0f8a8b77.tar.gz
rust-63fe441db8a441bc68c754c33a04f57f0f8a8b77.zip
Auto merge of #53088 - matthewjasper:closure-region-spans, r=nikomatsakis
[NLL] Use span of the closure args in free region errors

Also adds a note when one of the free regions is BrEnv.
In a future PR I'll change these messages to say "return requires", which should improve them a bit more.

r? @nikomatsakis
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr9
1 files changed, 4 insertions, 5 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 0ac295c54bc..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,11 +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