---

yaml
---
r: 36078
b: refs/heads/try2
c: 48c8d1f
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 46fef3d60155d4471ce23626501986aeb2c14c9b
+refs/heads/try2: 48c8d1fecd55098e87cdb9c027c2675a22df370f
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/ext/tt/macro_parser.rs

@@ -265,13 +265,13 @@ fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
                     match copy ei.sep {
                       Some(t) if idx == len => { // we need a separator
                         if tok == t { //pass the separator
-                            let ei_t <- ei;
+                            let ei_t = move ei;
                             ei_t.idx += 1;
                             next_eis.push(move ei_t);
                         }
                       }
                       _ => { // we don't need a separator
-                        let ei_t <- ei;
+                        let ei_t = move ei;
                         ei_t.idx = 0;
                         cur_eis.push(move ei_t);
                       }
@@ -297,7 +297,7 @@ fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
 
                     let matches = vec::map(ei.matches, // fresh, same size:
                                            |_m| DVec::<@named_match>());
-                    let ei_t <- ei;
+                    let ei_t = move ei;
                     cur_eis.push(~{
                         elts: matchers, sep: sep, mut idx: 0u,
                         mut up: matcher_pos_up(Some(move ei_t)),
@@ -308,7 +308,7 @@ fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
                   }
                   match_nonterminal(_,_,_) => { bb_eis.push(move ei) }
                   match_tok(t) => {
-                    let ei_t <- ei;
+                    let ei_t = move ei;
                     if t == tok {
                         ei_t.idx += 1;
                         next_eis.push(move ei_t);

branches/try2/src/rustc/middle/borrowck.rs

@@ -397,7 +397,7 @@ type req_maps = {
 
 fn save_and_restore<T:Copy,U>(save_and_restore_t: &mut T, f: fn() -> U) -> U {
     let old_save_and_restore_t = *save_and_restore_t;
-    let u <- f();
+    let u = f();
     *save_and_restore_t = old_save_and_restore_t;
     move u
 }

branches/try2/src/rustc/middle/typeck/infer.rs

@@ -562,7 +562,7 @@ impl infer_ctxt {
 
         debug!("commit()");
         do indent {
-            let r <- self.try(f);
+            let r = self.try(f);
 
             self.ty_var_bindings.bindings.truncate(0);
             self.int_var_bindings.bindings.truncate(0);