---

yaml
---
r: 22903
b: refs/heads/master
c: fd536d9
h: refs/heads/master
i:
  22901: 8c3aa79
  22899: bcd3f66
  22895: 932e796
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4991cc5d19a61da91345e9a324c0ea4b8d1b923d
+refs/heads/master: fd536d9d3e5a54b0a7b551a795198210fc229da3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/parse/parser.rs

@@ -1693,7 +1693,7 @@ class parser {
             }
           }
           tok {
-            if (!is_ident(tok) && tok != token::BINOP(token::PLUS)) ||
+            if !is_ident(tok) ||
                     self.is_keyword(~"true") || self.is_keyword(~"false") {
                 let val = self.parse_expr_res(RESTRICT_NO_BAR_OP);
                 if self.eat_keyword(~"to") {
@@ -1708,22 +1708,14 @@ class parser {
                 let binding_mode;
                 if self.eat_keyword(~"ref") {
                     binding_mode = bind_by_ref;
+                } else if self.eat_keyword(~"copy") {
+                    binding_mode = bind_by_value;
+                } else if refutable {
+                    // XXX: Should be bind_by_value, but that's not
+                    // backward compatible.
+                    binding_mode = bind_by_ref;
                 } else {
-                    alt self.token {
-                        token::BINOP(token::PLUS) => {
-                            // XXX: Temporary thing pending a snapshot.
-                            self.bump();
-                            binding_mode = bind_by_value;
-                        }
-                        _ if refutable => {
-                            // XXX: Should be bind_by_value, but that's not
-                            // backward compatible.
-                            binding_mode = bind_by_ref;
-                        }
-                        _ => {
-                            binding_mode = bind_by_value;
-                        }
-                    }
+                    binding_mode = bind_by_value;
                 }
 
                 if is_plain_ident(self.token) &&