Revert "change borrowck error msg: 'declared in outer block' -> 'capt…

…ured in a closure'"

This change requires some tests to be updated.

This reverts commit b5b8f5e.

src/rustc/middle/borrowck.rs

@@ -467,17 +467,15 @@ 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) {
-              "captured outer variable from within a heap closure"
-          }
+          cat_special(sk_heap_upvar) { "variable declared in an outer block" }
           cat_rvalue { "non-lvalue" }
           cat_local(_) { mut_str + " local variable" }
           cat_binding(_) { "pattern binding" }
           cat_arg(_) { "argument" }
           cat_deref(_, _, pk) { #fmt["dereference of %s %s pointer",
                                      mut_str, self.pk_to_sigil(pk)] }
           cat_stack_upvar(_) {
-            "captured " + mut_str + " variable from within a stack closure"
+            mut_str + " variable declared in an outer block"
           }
           cat_comp(_, comp_field(*)) { mut_str + " field" }
           cat_comp(_, comp_tuple) { "tuple content" }