---

yaml
---
r: 51411
b: refs/heads/incoming
c: 3d56936
h: refs/heads/master
i:
  51409: 265f86f
  51407: 5286411
v: v3

Author: luqmana

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: e182ac4bbde92a4a29fcdd3ff7c3906b394b8c16
+refs/heads/incoming: 3d56936be3c010829edf188475140dcb322da803
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -604,7 +604,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
                     mode: ast::expl(ast::by_val),
                     ty: expr_ty(bcx, in)
                 };
-                
+
                 unpack_result!(bcx, {
                     callee::trans_arg_expr(bcx, inty, in, &mut cleanups,
                                            None, callee::DontAutorefArg)
@@ -647,7 +647,8 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
             };
 
             if outputs.len() == 1 {
-                let op = PointerCast(bcx, aoutputs[0], T_ptr(val_ty(outputs[0])));
+                let op = PointerCast(bcx, aoutputs[0],
+                                     T_ptr(val_ty(outputs[0])));
                 Store(bcx, r, op);
             } else {
                 for aoutputs.eachi |i, o| {

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

@@ -163,7 +163,7 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree])
     MRExpr(@ast::expr {
         id: cx.next_id(),
         callee_id: cx.next_id(),
-        node: ast::expr_inline_asm(@asm, inputs, outputs, 
+        node: ast::expr_inline_asm(@asm, inputs, outputs,
                                    @cons, volatile, alignstack),
         span: sp
     })