diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-23 11:16:51 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-23 12:10:04 -0700 |
| commit | 48c8d1fecd55098e87cdb9c027c2675a22df370f (patch) | |
| tree | d5bdccd2a5f019330b44360dc61035127135d450 /src | |
| parent | 46fef3d60155d4471ce23626501986aeb2c14c9b (diff) | |
Remove uses of binary move in the compiler
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 8 | ||||
| -rw-r--r-- | src/rustc/middle/borrowck.rs | 2 | ||||
| -rw-r--r-- | src/rustc/middle/typeck/infer.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 17122b85fb3..76814a688f5 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/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); diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs index db0e092ed83..1b1ec022d3f 100644 --- a/src/rustc/middle/borrowck.rs +++ b/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 } diff --git a/src/rustc/middle/typeck/infer.rs b/src/rustc/middle/typeck/infer.rs index e0465b22c93..7619f25be4d 100644 --- a/src/rustc/middle/typeck/infer.rs +++ b/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); |