OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "change borrowck error msg: 'declared in outer block' -> 'captured in a closure'"

Browse Source 
This change requires some tests to be updated.

This reverts commit b5b8f5efcc.
This commit is contained in:
Brian Anderson 2012-07-08 00:07:15 -07:00
parent d0e69a9df7
commit ea03315cf4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rustc/middle/borrowck.rs
View File

@ -467,9 +467,7 @@ 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" }
@ -477,7 +475,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(_) {
"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" }