---

yaml
---
r: 68570
b: refs/heads/auto
c: 313dd37
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: af30fe25a58c5eb1ac088f824b22621ed3652976
+refs/heads/auto: 313dd37acb78b9fba701e9aebb0a01cb70b98db1
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/back/link.rs

@@ -660,9 +660,10 @@ pub fn sanitize(s: &str) -> ~str {
             | '_' => result.push_char(c),
 
             _ => {
-                if c > 'z' && char::is_XID_continue(c) {
-                    result.push_char(c);
-                }
+                let mut tstr = ~"";
+                do char::escape_unicode(c) |c| { tstr.push_char(c); }
+                result.push_char('$');
+                result.push_str(tstr.slice_from(1));
             }
         }
     }

branches/auto/src/librustc/middle/borrowck/mod.rs

@@ -538,12 +538,13 @@ impl BorrowckCtxt {
 
             move_data::MoveExpr(expr) => {
                 let expr_ty = ty::expr_ty_adjusted(self.tcx, expr);
+                let suggestion = move_suggestion(self.tcx, expr_ty,
+                        "moved by default (use `copy` to override)");
                 self.tcx.sess.span_note(
                     expr.span,
-                    fmt!("`%s` moved here because it has type `%s`, \
-                          which is moved by default (use `copy` to override)",
+                    fmt!("`%s` moved here because it has type `%s`, which is %s",
                          self.loan_path_to_str(moved_lp),
-                         expr_ty.user_string(self.tcx)));
+                         expr_ty.user_string(self.tcx), suggestion));
             }
 
             move_data::MovePat(pat) => {
@@ -557,12 +558,28 @@ impl BorrowckCtxt {
             }
 
             move_data::Captured(expr) => {
+                let expr_ty = ty::expr_ty_adjusted(self.tcx, expr);
+                let suggestion = move_suggestion(self.tcx, expr_ty,
+                        "moved by default (make a copy and \
+                         capture that instead to override)");
                 self.tcx.sess.span_note(
                     expr.span,
-                    fmt!("`%s` moved into closure environment here \
-                          because its type is moved by default \
-                          (make a copy and capture that instead to override)",
-                         self.loan_path_to_str(moved_lp)));
+                    fmt!("`%s` moved into closure environment here because it \
+                          has type `%s`, which is %s",
+                         self.loan_path_to_str(moved_lp),
+                         expr_ty.user_string(self.tcx), suggestion));
+            }
+        }
+
+        fn move_suggestion(tcx: ty::ctxt, ty: ty::t, default_msg: &'static str)
+                          -> &'static str {
+            match ty::get(ty).sty {
+                ty::ty_closure(ref cty) if cty.sigil == ast::BorrowedSigil =>
+                    "a non-copyable stack closure (capture it in a new closure, \
+                     e.g. `|x| f(x)`, to override)",
+                _ if !ty::type_is_copyable(tcx, ty) =>
+                    "non-copyable (perhaps you meant to use clone()?)",
+                _ => default_msg,
             }
         }
     }

branches/auto/src/librustc/middle/kind.rs

@@ -198,9 +198,8 @@ 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,
-            "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
+            "attempted dynamic environment capture");
+    }
 
     let fty = ty::node_id_to_type(cx.tcx, id);
     match ty::get(fty).sty {

branches/auto/src/librustc/middle/resolve.rs

@@ -3382,8 +3382,7 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "can't capture dynamic environment in a fn item; \
-                            use the || { ... } closure form instead");
+                            "attempted dynamic environment-capture");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.
@@ -3405,8 +3404,7 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "can't capture dynamic environment in a fn item; \
-                            use the || { ... } closure form instead");
+                            "attempted dynamic environment-capture");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.
@@ -3848,6 +3846,27 @@ impl Resolver {
                           generics: &Generics,
                           fields: &[@struct_field],
                           visitor: ResolveVisitor) {
+        let mut ident_map = HashMap::new::<ast::ident, @struct_field>();
+        for fields.iter().advance |&field| {
+            match field.node.kind {
+                named_field(ident, _) => {
+                    match ident_map.find(&ident) {
+                        Some(&prev_field) => {
+                            let ident_str = self.session.str_of(ident);
+                            self.session.span_err(field.span,
+                                fmt!("field `%s` is already declared", ident_str));
+                            self.session.span_note(prev_field.span,
+                                "Previously declared here");
+                        },
+                        None => {
+                            ident_map.insert(ident, field);
+                        }
+                    }
+                }
+                _ => ()
+            }
+        }
+
         // If applicable, create a rib for the type parameters.
         do self.with_type_parameter_rib(HasTypeParameters
                                         (generics, id, 0,

branches/auto/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: can't capture dynamic environment in a fn item;
+// error-pattern: attempted dynamic environment-capture
 fn foo() {
     let x: int;
     fn bar() { log(debug, x); }

branches/auto/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: can't capture dynamic environment in a fn item;
+// error-pattern: attempted dynamic environment-capture
 fn foo(x: int) {
     fn bar() { log(debug, x); }
 }

branches/auto/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: can't capture dynamic environment in a fn item;
+// error-pattern: attempted dynamic environment-capture
 fn foo(x: int) {
     fn mth() {
         fn bar() { log(debug, x); }

branches/auto/src/test/compile-fail/capture1.rs

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

branches/auto/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 can't capture dynamic environment
+           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
            //~^ ERROR unresolved name `k0`.
         }
     }

branches/auto/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 can't capture dynamic environment
+            self.v0 = k0 ^ 0x736f6d6570736575;  //~ ERROR attempted dynamic environment-capture
             //~^ ERROR unresolved name `k0`.
-            self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR can't capture dynamic environment
+            self.v1 = k1 ^ 0x646f72616e646f6d;   //~ ERROR attempted dynamic environment-capture
             //~^ ERROR unresolved name `k1`.
         }
         fn result(&self) -> u64 { return mk_result(self); }

branches/auto/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 can't capture dynamic environment
+           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture
            //~^ ERROR unresolved name `k0`.
         }
     }

branches/auto/src/test/compile-fail/struct-fields-decl-dupe.rs

@@ -0,0 +1,17 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct BuildData {
+    foo: int,
+    foo: int, //~ ERROR field `foo` is already declared
+}
+
+fn main() {
+}