rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make moves explicit in rustc::middle

Browse Source
This commit is contained in:
Tim Chevalier
2012-10-12 18:02:02 -07:00
parent c5fa613498
commit d0ed13c4bd
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rustc/middle/trans/alt.rs
View File

@@ -1202,7 +1202,7 @@ fn trans_alt_inner(scope_cx: block,
arm_cxs.push(bcx); arm_cxs.push(bcx);
} }
return controlflow::join_blocks(scope_cx, dvec::unwrap(arm_cxs)); return controlflow::join_blocks(scope_cx, dvec::unwrap(move arm_cxs));
fn mk_fail(bcx: block, sp: span, msg: ~str, fn mk_fail(bcx: block, sp: span, msg: ~str,
done: @mut Option<BasicBlockRef>) -> BasicBlockRef { done: @mut Option<BasicBlockRef>) -> BasicBlockRef {

2
src/rustc/middle/trans/common.rs
View File

@@ -511,7 +511,7 @@ fn block_(llbb: BasicBlockRef, parent: Option<block>, -kind: block_kind,
terminated: false, terminated: false,
unreachable: false, unreachable: false,
parent: parent, parent: parent,
kind: kind, kind: move kind,
is_lpad: is_lpad, is_lpad: is_lpad,
node_info: node_info, node_info: node_info,
fcx: fcx fcx: fcx

4
src/rustc/middle/typeck/infer/combine.rs
View File

@@ -88,9 +88,9 @@ fn expected_found<C: combine,T>(
self: &C, +a: T, +b: T) -> ty::expected_found<T> { self: &C, +a: T, +b: T) -> ty::expected_found<T> {
if self.a_is_expected() { if self.a_is_expected() {
ty::expected_found {expected: a, found: b} ty::expected_found {expected: move a, found: move b}
} else { } else {
ty::expected_found {expected: b, found: a} ty::expected_found {expected: move b, found: move a}
} }
} }