librustc: Get rid of move.

Author: luqmana

src/librustc/back/link.rs

@@ -156,7 +156,7 @@ pub mod jit {
                     code: entry,
                     env: ptr::null()
                 };
-                let func: fn(++argv: ~[~str]) = cast::transmute(move closure);
+                let func: fn(++argv: ~[~str]) = cast::transmute(closure);
 
                 func(~[/*bad*/copy sess.opts.binary]);
             }
@@ -559,11 +559,11 @@ pub fn build_link_meta(sess: Session, c: &ast::crate, output: &Path,
 
     let {name: opt_name, vers: opt_vers,
          cmh_items: cmh_items} = provided_link_metas(sess, c);
-    let name = crate_meta_name(sess, output, move opt_name);
-    let vers = crate_meta_vers(sess, move opt_vers);
+    let name = crate_meta_name(sess, output, opt_name);
+    let vers = crate_meta_vers(sess, opt_vers);
     let dep_hashes = cstore::get_dep_hashes(sess.cstore);
     let extras_hash =
-        crate_meta_extras_hash(symbol_hasher, move cmh_items,
+        crate_meta_extras_hash(symbol_hasher, cmh_items,
                                dep_hashes);
 
     return {name: name, vers: vers, extras_hash: extras_hash};

src/librustc/driver/driver.rs

@@ -172,7 +172,7 @@ pub 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));
-    move rv
+    rv
 }
 
 pub enum compile_upto {
@@ -257,7 +257,7 @@ pub fn compile_upto(sess: Session, cfg: ast::crate_cfg,
     let (llmod, link_meta) = {
 
         let ty_cx = ty::mk_ctxt(sess, def_map, ast_map, freevars,
-                                region_map, rp_set, move lang_items, crate);
+                                region_map, rp_set, lang_items, crate);
 
         let (method_map, vtable_map) =
             time(time_passes, ~"typechecking", ||

src/librustc/lib/llvm.rs

@@ -1481,7 +1481,7 @@ pub fn struct_element_types(struct_ty: TypeRef) -> ~[TypeRef] {
             llvm::LLVMGetStructElementTypes(
                 struct_ty, ptr::to_mut_unsafe_ptr(&mut buf[0]));
         }
-        return move buf;
+        return buf;
     }
 }
 

src/librustc/metadata/decoder.rs

@@ -752,10 +752,10 @@ pub fn get_provided_trait_methods(intr: @ident_interner, cdata: cmd,
             def_id: did
         };
 
-        vec::push(&mut result, move provided_trait_method_info);
+        vec::push(&mut result, provided_trait_method_info);
     }
 
-    return move result;
+    return result;
 }
 
 /// Returns the supertraits of the given trait.
@@ -766,7 +766,7 @@ pub fn get_supertraits(cdata: cmd, id: ast::node_id, tcx: ty::ctxt)
     for reader::tagged_docs(item_doc, tag_impl_trait) |trait_doc| {
         results.push(doc_type(trait_doc, tcx, cdata));
     }
-    return dvec::unwrap(move results);
+    return dvec::unwrap(results);
 }
 
 // If the item in question is a trait, returns its set of methods and
@@ -847,7 +847,7 @@ pub fn get_static_methods_if_impl(intr: @ident_interner,
         }
     }
 
-    return Some(dvec::unwrap(move static_impl_methods));
+    return Some(dvec::unwrap(static_impl_methods));
 }
 
 pub fn get_item_attrs(cdata: cmd,

src/librustc/metadata/loader.rs

@@ -228,7 +228,7 @@ fn get_metadata_section(os: os,
                            csz - vlen);
                     do vec::raw::buf_as_slice(cvbuf1, csz-vlen) |bytes| {
                         let inflated = flate::inflate_bytes(bytes);
-                        found = move Some(@(move inflated));
+                        found = Some(@(inflated));
                     }
                     if found != None {
                         return found;

src/librustc/middle/astencode.rs

@@ -1140,7 +1140,7 @@ fn decode_side_tables(xcx: extended_decode_ctxt,
                 let ids = val_dsr.read_to_vec(|| {
                     xcx.tr_id(val_dsr.read_int())
                 });
-                let dvec = @dvec::from_vec(move ids);
+                let dvec = @dvec::from_vec(ids);
                 dcx.maps.last_use_map.insert(id, dvec);
             } else if tag == (c::tag_table_method_map as uint) {
                 dcx.maps.method_map.insert(

src/librustc/middle/borrowck/check_loans.rs

@@ -632,7 +632,7 @@ fn check_loans_in_fn(fk: visit::fn_kind,
                             _ => {} // Ignore this argument.
                         }
                     }
-                    *self.fn_args = @move fn_args;
+                    *self.fn_args = @fn_args;
                 }
             }
 

src/librustc/middle/borrowck/gather_loans.rs

@@ -376,8 +376,8 @@ impl GatherLoanCtxt {
           Some(_) => {
               match loan::loan(self.bccx, cmt, scope_r, loan_kind) {
                   Err(ref e) => { self.bccx.report((*e)); }
-                  Ok(move loans) => {
-                      self.add_loans(cmt, loan_kind, scope_r, move loans);
+                  Ok(loans) => {
+                      self.add_loans(cmt, loan_kind, scope_r, loans);
                   }
               }
           }
@@ -540,7 +540,7 @@ impl GatherLoanCtxt {
             }
         };
 
-        self.add_loans_to_scope_id(scope_id, move loans);
+        self.add_loans_to_scope_id(scope_id, loans);
 
         if loan_kind.is_freeze() && !cmt.mutbl.is_immutable() {
             self.bccx.stats.loaned_paths_imm += 1;
@@ -566,7 +566,7 @@ impl GatherLoanCtxt {
                 req_loans.push_all(loans);
             }
             None => {
-                let dvec = @dvec::from_vec(move loans);
+                let dvec = @dvec::from_vec(loans);
                 let req_loan_map = self.req_maps.req_loan_map;
                 req_loan_map.insert(scope_id, dvec);
             }

src/librustc/middle/borrowck/mod.rs

@@ -420,15 +420,15 @@ pub fn save_and_restore<T:Copy,U>(save_and_restore_t: &mut T,
     let old_save_and_restore_t = *save_and_restore_t;
     let u = f();
     *save_and_restore_t = old_save_and_restore_t;
-    move u
+    u
 }
 
 pub fn save_and_restore_managed<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();
     *save_and_restore_t = old_save_and_restore_t;
-    move u
+    u
 }
 
 impl LoanKind {

src/librustc/middle/liveness.rs

@@ -1520,7 +1520,7 @@ impl Liveness {
         self.cont_ln.insert(loop_node_id, cont_ln);
         let r = f();
         self.loop_scope.pop();
-        move r
+        r
     }
 }
 

src/librustc/middle/resolve.rs

@@ -797,7 +797,7 @@ pub fn Resolver(session: Session,
         intr: session.intr()
     };
 
-    move self
+    self
 }
 
 /// The main resolver class.
@@ -3255,7 +3255,7 @@ pub impl Resolver {
         self.add_exports_for_module(&mut exports2, module_);
         match copy module_.def_id {
             Some(def_id) => {
-                self.export_map2.insert(def_id.node, move exports2);
+                self.export_map2.insert(def_id.node, exports2);
                 debug!("(computing exports) writing exports for %d (some)",
                        def_id.node);
             }

src/librustc/middle/trans/_match.rs

@@ -559,7 +559,7 @@ pub fn enter_opt(bcx: block, m: &[@Match/&r], opt: &Opt, col: uint,
                                 Some(fp) => reordered_patterns.push(fp.pat)
                             }
                     }
-                    Some(dvec::unwrap(move reordered_patterns))
+                    Some(dvec::unwrap(reordered_patterns))
                 } else {
                     None
                 }
@@ -815,7 +815,7 @@ pub fn get_options(ccx: @crate_ctxt, m: &[@Match], col: uint) -> ~[Opt] {
             _ => {}
         }
     }
-    return dvec::unwrap(move found);
+    return dvec::unwrap(found);
 }
 
 pub fn extract_variant_args(bcx: block,
@@ -1657,7 +1657,7 @@ pub fn trans_match_inner(scope_cx: block,
         arm_cxs.push(bcx);
     }
 
-    bcx = controlflow::join_blocks(scope_cx, dvec::unwrap(move arm_cxs));
+    bcx = controlflow::join_blocks(scope_cx, dvec::unwrap(arm_cxs));
     return bcx;
 
     fn mk_fail(bcx: block, sp: span, +msg: ~str,

src/librustc/middle/trans/base.rs

@@ -1174,7 +1174,7 @@ pub fn new_block(cx: fn_ctxt, parent: Option<block>, +kind: block_kind,
         });
         let bcx = mk_block(llbb,
                            parent,
-                           move kind,
+                           kind,
                            is_lpad,
                            opt_node_info,
                            cx);

src/librustc/middle/trans/cabi_x86_64.rs

@@ -274,11 +274,11 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
     if words > 4 {
         all_mem(cls);
         let cls = cls;
-        return move cls;
+        return cls;
     }
     classify(ty, cls, 0, 0);
     fixup(ty, cls);
-    return move cls;
+    return cls;
 }
 
 fn llreg_ty(cls: &[x86_64_reg_class]) -> TypeRef {

src/librustc/middle/trans/common.rs

@@ -593,7 +593,7 @@ pub fn block_(llbb: BasicBlockRef, parent: Option<block>, -kind: block_kind,
         terminated: false,
         unreachable: false,
         parent: parent,
-        kind: move kind,
+        kind: kind,
         is_lpad: is_lpad,
         node_info: node_info,
         fcx: fcx
@@ -607,7 +607,7 @@ pub enum block = @block_;
 pub fn mk_block(llbb: BasicBlockRef, parent: Option<block>, -kind: block_kind,
             is_lpad: bool, node_info: Option<node_info>, fcx: fn_ctxt)
     -> block {
-    block(@block_(llbb, parent, move kind, is_lpad, node_info, fcx))
+    block(@block_(llbb, parent, kind, is_lpad, node_info, fcx))
 }
 
 // First two args are retptr, env

src/librustc/middle/trans/debuginfo.rs

@@ -152,7 +152,7 @@ enum debug_metadata {
 fn cast_safely<T: Copy, U>(val: T) -> U {
     unsafe {
         let val2 = val;
-        return cast::transmute(move val2);
+        return cast::transmute(val2);
     }
 }
 

src/librustc/middle/ty.rs

@@ -320,7 +320,7 @@ pub pure fn get(t: t) -> t_box {
     unsafe {
         let t2 = cast::reinterpret_cast::<t, t_box>(&t);
         let t3 = t2;
-        cast::forget(move t2);
+        cast::forget(t2);
         t3
     }
 }
@@ -830,7 +830,7 @@ pub fn mk_ctxt(s: session::Session,
         inferred_modes: HashMap(),
         adjustments: HashMap(),
         normalized_cache: new_ty_hash(),
-        lang_items: move lang_items,
+        lang_items: lang_items,
         legacy_boxed_traits: HashMap(),
         provided_methods: HashMap(),
         provided_method_sources: HashMap(),
@@ -909,10 +909,10 @@ fn mk_t_with_id(cx: ctxt, +st: sty, o_def_id: Option<ast::def_id>) -> t {
       }
     }
 
-    let t = @{sty: move st, id: cx.next_id, flags: flags, o_def_id: o_def_id};
+    let t = @{sty: st, id: cx.next_id, flags: flags, o_def_id: o_def_id};
 
     let key = intern_key {sty: to_unsafe_ptr(&t.sty), o_def_id: o_def_id};
-    cx.interner.insert(move key, t);
+    cx.interner.insert(key, t);
 
     cx.next_id += 1u;
     unsafe { cast::reinterpret_cast(&t) }
@@ -1178,7 +1178,7 @@ pub fn fold_sig(sig: &FnSig, fldop: fn(t) -> t) -> FnSig {
     };
 
     FnSig {
-        inputs: move args,
+        inputs: args,
         output: fldop(sig.output)
     }
 }
@@ -3110,7 +3110,7 @@ pub fn expr_kind(tcx: ctxt,
                 ast::def_local(*) |
                 ast::def_self(*) => LvalueExpr,
 
-                move def => {
+                def => {
                     tcx.sess.span_bug(expr.span, fmt!(
                         "Uncategorized def for expr %?: %?",
                         expr.id, def));
@@ -3617,7 +3617,7 @@ pub fn trait_supertraits(cx: ctxt,
     }
 
     // Unwrap and return the result.
-    return @dvec::unwrap(move result);
+    return @dvec::unwrap(result);
 }
 
 pub fn trait_methods(cx: ctxt, id: ast::def_id) -> @~[method] {