Skip to content

Commit 7fa11b0

Browse files
committed
---
yaml --- r: 38592 b: refs/heads/incoming c: d0ed13c h: refs/heads/master v: v3
1 parent 8e2c7af commit 7fa11b0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: c5fa61349894282f9b9a367e08ede0ca4ef67a75
9+
refs/heads/incoming: d0ed13c4bdb19b2e9c445908775794f0880a301c
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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 {

branches/incoming/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

branches/incoming/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)