From 8ffab392ab286ac4e8028adcdae78e512c6409eb Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Mon, 9 Jul 2012 13:56:47 -0400
Subject: change borrowck error msg: 'declared in outer block' -> 'captured in
 a closure' (properly this time)

---
 src/rustc/middle/borrowck.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/rustc')

diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index 38559aec28d..eb78e46f273 100644
--- a/src/rustc/middle/borrowck.rs
+++ b/src/rustc/middle/borrowck.rs
@@ -467,7 +467,9 @@ impl to_str_methods for borrowck_ctxt {
           cat_special(sk_method) { "method" }
           cat_special(sk_static_item) { "static item" }
           cat_special(sk_self) { "self reference" }
-          cat_special(sk_heap_upvar) { "variable declared in an outer block" }
+          cat_special(sk_heap_upvar) {
+              "captured outer variable in a heap closure"
+          }
           cat_rvalue { "non-lvalue" }
           cat_local(_) { mut_str + " local variable" }
           cat_binding(_) { "pattern binding" }
@@ -475,7 +477,7 @@ impl to_str_methods for borrowck_ctxt {
           cat_deref(_, _, pk) { #fmt["dereference of %s %s pointer",
                                      mut_str, self.pk_to_sigil(pk)] }
           cat_stack_upvar(_) {
-            mut_str + " variable declared in an outer block"
+            "captured outer " + mut_str + " variable in a stack closure"
           }
           cat_comp(_, comp_field(*)) { mut_str + " field" }
           cat_comp(_, comp_tuple) { "tuple content" }
-- 
cgit 1.4.1-3-g733a5