From 6ee31e2af7b512bdcc85beabadf2e91152217040 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 6 Dec 2017 16:19:26 -0500
Subject: [PATCH] escape-upvar-ref: patch comment per arielb1

---
 .../closure-requirements/escape-upvar-ref.rs  | 11 +++++++--
 .../escape-upvar-ref.stderr                   | 24 +++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs b/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs
index 5d14501cdbb..548a5ae5969 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs
+++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs
@@ -9,8 +9,15 @@
 // except according to those terms.
 
 // Test closure that:
-// - captures a variable `y`
-// - stores reference to `y` into another, longer-lived spot
+//
+// - captures a variable `y` by reference
+// - stores that reference to `y` into another, longer-lived place (`p`)
+//
+// Both of these are upvars of reference type (the capture of `y` is
+// of type `&'a i32`, the capture of `p` is of type `&mut &'b
+// i32`). The closure thus computes a relationship between `'a` and
+// `'b`.  This relationship is propagated to the closure creator,
+// which reports an error.
 
 // compile-flags:-Znll -Zborrowck=mir -Zverbose
 
diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
index 0a182fbc278..47ba66ade65 100644
--- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
@@ -1,7 +1,7 @@
 note: External requirements
-  --> $DIR/escape-upvar-ref.rs:26:27
+  --> $DIR/escape-upvar-ref.rs:33:27
    |
-26 |         let mut closure = || p = &y;
+33 |         let mut closure = || p = &y;
    |                           ^^^^^^^^^
    |
    = note: defining type: DefId(0/1:9 ~ escape_upvar_ref[317d]::test[0]::{{closure}}[0]) with closure substs [
@@ -14,26 +14,26 @@ note: External requirements
    = note: where '_#3r: '_#2r
 
 note: No external requirements
-  --> $DIR/escape-upvar-ref.rs:20:1
+  --> $DIR/escape-upvar-ref.rs:27:1
    |
-20 | / fn test() {
-21 | |     let x = 44;
-22 | |     let mut p = &x;
-23 | |
+27 | / fn test() {
+28 | |     let x = 44;
+29 | |     let mut p = &x;
+30 | |
 ...  |
-30 | |     deref(p);
-31 | | }
+37 | |     deref(p);
+38 | | }
    | |_^
    |
    = note: defining type: DefId(0/0:3 ~ escape_upvar_ref[317d]::test[0]) with substs []
 
 error[E0597]: borrowed value does not live long enough
-  --> $DIR/escape-upvar-ref.rs:28:6
+  --> $DIR/escape-upvar-ref.rs:35:6
    |
-25 |         let y = 22;
+32 |         let y = 22;
    |             - temporary value created here
 ...
-28 |     } //~ ERROR borrowed value does not live long enough
+35 |     } //~ ERROR borrowed value does not live long enough
    |      ^ temporary value dropped here while still borrowed
    |
    = note: consider using a `let` binding to increase its lifetime
-- 
GitLab