Skip to content

Commit d0ed13c

Browse files
committed
Make moves explicit in rustc::middle
1 parent c5fa613 commit d0ed13c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/rustc/middle/trans/alt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ fn trans_alt_inner(scope_cx: block,
12021202
arm_cxs.push(bcx);
12031203
}
12041204
1205-
return controlflow::join_blocks(scope_cx, dvec::unwrap(arm_cxs));
1205+
return controlflow::join_blocks(scope_cx, dvec::unwrap(move arm_cxs));
12061206
12071207
fn mk_fail(bcx: block, sp: span, msg: ~str,
12081208
done: @mut Option<BasicBlockRef>) -> BasicBlockRef {

src/rustc/middle/trans/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ fn block_(llbb: BasicBlockRef, parent: Option<block>, -kind: block_kind,
511511
terminated: false,
512512
unreachable: false,
513513
parent: parent,
514-
kind: kind,
514+
kind: move kind,
515515
is_lpad: is_lpad,
516516
node_info: node_info,
517517
fcx: fcx

src/rustc/middle/typeck/infer/combine.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ fn expected_found<C: combine,T>(
8888
self: &C, +a: T, +b: T) -> ty::expected_found<T> {
8989

9090
if self.a_is_expected() {
91-
ty::expected_found {expected: a, found: b}
91+
ty::expected_found {expected: move a, found: move b}
9292
} else {
93-
ty::expected_found {expected: b, found: a}
93+
ty::expected_found {expected: move b, found: move a}
9494
}
9595
}
9696

0 commit comments

Comments
 (0)