Skip to content

Commit b923dd8

Browse files
committed
---
yaml --- r: 139040 b: refs/heads/try2 c: 3d56936 h: refs/heads/master v: v3
1 parent 9d52971 commit b923dd8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: e182ac4bbde92a4a29fcdd3ff7c3906b394b8c16
8+
refs/heads/try2: 3d56936be3c010829edf188475140dcb322da803
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/expr.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
604604
mode: ast::expl(ast::by_val),
605605
ty: expr_ty(bcx, in)
606606
};
607-
607+
608608
unpack_result!(bcx, {
609609
callee::trans_arg_expr(bcx, inty, in, &mut cleanups,
610610
None, callee::DontAutorefArg)
@@ -647,7 +647,8 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
647647
};
648648
649649
if outputs.len() == 1 {
650-
let op = PointerCast(bcx, aoutputs[0], T_ptr(val_ty(outputs[0])));
650+
let op = PointerCast(bcx, aoutputs[0],
651+
T_ptr(val_ty(outputs[0])));
651652
Store(bcx, r, op);
652653
} else {
653654
for aoutputs.eachi |i, o| {

branches/try2/src/libsyntax/ext/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree])
163163
MRExpr(@ast::expr {
164164
id: cx.next_id(),
165165
callee_id: cx.next_id(),
166-
node: ast::expr_inline_asm(@asm, inputs, outputs,
166+
node: ast::expr_inline_asm(@asm, inputs, outputs,
167167
@cons, volatile, alignstack),
168168
span: sp
169169
})

0 commit comments

Comments
 (0)