---

yaml
---
r: 28452
b: refs/heads/try
c: 3aa5b0c
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 4a865401f580863c67b9dd0e44a0192f21817c7c
+refs/heads/try: 3aa5b0cb4403e0a61a11455ac615108b67e45ccd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/driver/driver.rs

@@ -125,7 +125,7 @@ fn time<T>(do_it: bool, what: ~str, thunk: fn() -> T) -> T {
     let end = std::time::precise_time_s();
     io::stdout().write_str(fmt!("time: %3.3f s\t%s\n",
                                 end - start, what));
-    return rv;
+    move rv
 }
 
 enum compile_upto {

branches/try/src/rustc/metadata/encoder.rs

@@ -1103,7 +1103,7 @@ fn encode_metadata(parms: encode_parms, crate: @crate) -> ~[u8] {
         diag: parms.diag,
         tcx: parms.tcx,
         buf: buf,
-        stats: stats,
+        stats: move stats,
         reachable: parms.reachable,
         reexports: parms.reexports,
         reexports2: parms.reexports2,

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

@@ -400,7 +400,7 @@ fn save_and_restore<T:Copy,U>(&save_and_restore_t: T, f: fn() -> U) -> U {
     let old_save_and_restore_t = save_and_restore_t;
     let u <- f();
     save_and_restore_t = old_save_and_restore_t;
-    return u;
+    move u
 }
 
 /// Creates and returns a new root_map

branches/try/src/rustc/middle/liveness.rs

@@ -1466,7 +1466,7 @@ impl Liveness {
         let r <- f();
         self.break_ln = bl;
         self.cont_ln = cl;
-        return r;
+        move r
     }
 }
 

branches/try/src/rustc/middle/resolve.rs

@@ -728,7 +728,7 @@ fn Resolver(session: session, lang_items: LanguageItems,
         intr: session.intr()
     };
 
-    return self;
+    move self
 }
 
 /// The main resolver class.

branches/try/src/rustc/middle/trans/foreign.rs

@@ -256,27 +256,27 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
                 if cls[i] == sseup_class {
                     cls[i] = sse_int_class;
                 } else if is_sse(cls[i]) {
-                    i += 1u;
+                    i += 1;
                     while cls[i] == sseup_class { i += 1u; }
                 } else if cls[i] == x87_class {
-                    i += 1u;
+                    i += 1;
                     while cls[i] == x87up_class { i += 1u; }
                 } else {
-                    i += 1u;
+                    i += 1;
                 }
             }
         }
     }
 
-    let words = (ty_size(ty) + 7u) / 8u;
+    let words = (ty_size(ty) + 7) / 8;
     let cls = vec::to_mut(vec::from_elem(words, no_class));
-    if words > 4u {
+    if words > 4 {
         all_mem(cls);
-        return vec::from_mut(cls);
+        return vec::from_mut(move cls);
     }
-    classify(ty, cls, 0u, 0u);
+    classify(ty, cls, 0, 0);
     fixup(ty, cls);
-    return vec::from_mut(cls);
+    return vec::from_mut(move cls);
 }
 
 fn llreg_ty(cls: ~[x86_64_reg_class]) -> TypeRef {

branches/try/src/rustc/middle/typeck/check.rs

@@ -740,7 +740,7 @@ impl @fn_ctxt {
         self.region_lb = lb;
         let v <- f();
         self.region_lb = old_region_lb;
-        return v;
+        move v
     }
 
     fn region_var_if_parameterized(rp: Option<ty::region_variance>,

branches/try/src/rustc/middle/typeck/check/regionck.rs

@@ -92,18 +92,18 @@ impl @rcx {
 }
 
 fn regionck_expr(fcx: @fn_ctxt, e: @ast::expr) {
-    let rcx = rcx_({fcx:fcx, mut errors_reported: 0u});
+    let rcx = rcx_({fcx:fcx, mut errors_reported: 0});
     let v = regionck_visitor();
-    v.visit_expr(e, @rcx, v);
+    v.visit_expr(e, @(move rcx), v);
     fcx.infcx().resolve_regions();
 }
 
 fn regionck_fn(fcx: @fn_ctxt,
                _decl: ast::fn_decl,
                blk: ast::blk) {
-    let rcx = rcx_({fcx:fcx, mut errors_reported: 0u});
+    let rcx = rcx_({fcx:fcx, mut errors_reported: 0});
     let v = regionck_visitor();
-    v.visit_block(blk, @rcx, v);
+    v.visit_block(blk, @(move rcx), v);
     fcx.infcx().resolve_regions();
 }
 

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

@@ -565,7 +565,7 @@ impl infer_ctxt {
             self.ty_var_bindings.bindings = ~[];
             self.int_var_bindings.bindings = ~[];
             self.region_vars.commit();
-            r
+            move r
         }
     }
 
@@ -579,7 +579,7 @@ impl infer_ctxt {
               Ok(_) => (),
               Err(_) => self.rollback_to(&snapshot)
             }
-            r
+            move r
         }
     }
 
@@ -590,7 +590,7 @@ impl infer_ctxt {
             let snapshot = self.start_snapshot();
             let r = self.try(f);
             self.rollback_to(&snapshot);
-            r
+            move r
         }
     }
 }

branches/try/src/rustc/middle/typeck/infer/region_var_bindings.rs

@@ -866,7 +866,7 @@ impl RegionVarBindings {
             }
         }
 
-        return graph;
+        return (move graph);
 
         fn insert_edge(graph: &mut Graph,
                        node_id: RegionVid,

branches/try/src/rustc/util/common.rs

@@ -11,7 +11,7 @@ fn indent<R>(op: fn() -> R) -> R {
     debug!(">>");
     let r <- op();
     debug!("<< (Result = %?)", r);
-    return r;
+    move r
 }
 
 struct _indenter {