---

yaml
---
r: 83917
b: refs/heads/dist-snap
c: 0c6fc46
h: refs/heads/master
i:
  83915: 99f1fc6
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: cdea73cf5b94784fdc910ab23d5d3455c868d247
+refs/heads/dist-snap: 0c6fc46c030ab0515a052fa99c9e10c75cfc8184
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/kind.rs

@@ -198,8 +198,9 @@ fn with_appropriate_checker(cx: Context, id: node_id,
     fn check_for_bare(cx: Context, fv: @freevar_entry) {
         cx.tcx.sess.span_err(
             fv.span,
-            "attempted dynamic environment capture");
-    }
+            "can't capture dynamic environment in a fn item; \
+            use the || { ... } closure form instead");
+    } // same check is done in resolve.rs, but shouldn't be done
 
     let fty = ty::node_id_to_type(cx.tcx, id);
     match ty::get(fty).sty {

branches/dist-snap/src/librustc/middle/resolve.rs

@@ -3381,7 +3381,8 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "attempted dynamic environment-capture");
+                            "can't capture dynamic environment in a fn item; \
+                            use the || { ... } closure form instead");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.
@@ -3403,7 +3404,8 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "attempted dynamic environment-capture");
+                            "can't capture dynamic environment in a fn item; \
+                            use the || { ... } closure form instead");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.

branches/dist-snap/src/test/compile-fail/bad-env-capture.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo() {
     let x: int;
     fn bar() { log(debug, x); }

branches/dist-snap/src/test/compile-fail/bad-env-capture2.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: int) {
     fn bar() { log(debug, x); }
 }

branches/dist-snap/src/test/compile-fail/bad-env-capture3.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: int) {
     fn mth() {
         fn bar() { log(debug, x); }

branches/dist-snap/src/test/compile-fail/capture1.rs

@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 
 fn main() {
     let bar: int = 5;

branches/dist-snap/src/test/compile-fail/issue-3021-b.rs

@@ -18,7 +18,7 @@ fn siphash(k0 : u64) {
 
     impl siphash {
         pub fn reset(&mut self) {
-           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
+           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
            //~^ ERROR unresolved name `k0`.
         }
     }

branches/dist-snap/src/test/compile-fail/issue-3021-d.rs

@@ -30,9 +30,9 @@ fn siphash(k0 : u64, k1 : u64) -> siphash {
 
    impl siphash for SipState {
         fn reset(&self) {
-            self.v0 = k0 ^ 0x736f6d6570736575;  //~ ERROR attempted dynamic environment-capture
+            self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
             //~^ ERROR unresolved name `k0`.
-            self.v1 = k1 ^ 0x646f72616e646f6d;   //~ ERROR attempted dynamic environment-capture
+            self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR can't capture dynamic environment
             //~^ ERROR unresolved name `k1`.
         }
         fn result(&self) -> u64 { return mk_result(self); }

branches/dist-snap/src/test/compile-fail/issue-3021.rs

@@ -21,7 +21,7 @@ fn siphash(k0 : u64) -> SipHash {
 
     impl SipHash for SipState {
         fn reset(&self) {
-           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
+           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
            //~^ ERROR unresolved name `k0`.
         }
     }