---

yaml
---
r: 165407
b: refs/heads/master
c: 9115b31
h: refs/heads/master
i:
  165405: 1c01f17
  165403: 06cf35e
  165399: d03a1e6
  165391: 578bc58
  165375: 910c019
v: v3

Author: Aatch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fb3e871734957d83aab0cc55d45be7d75d6a7b15
+refs/heads/master: 9115b319c31d644f01387c9fe3eff9a498941090
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b

trunk/src/librustc_trans/trans/base.rs

@@ -1381,7 +1381,8 @@ fn build_cfg(tcx: &ty::ctxt, id: ast::NodeId) -> (ast::NodeId, Option<cfg::CFG>)
                 _ => tcx.sess.bug("unexpected expr variant in has_nested_returns")
             }
         }
-        Some(ast_map::NodeVariant(..)) | Some(ast_map::NodeStructCtor(..)) => return (ast::DUMMY_NODE_ID, None),
+        Some(ast_map::NodeVariant(..)) |
+        Some(ast_map::NodeStructCtor(..)) => return (ast::DUMMY_NODE_ID, None),
 
         // glue, shims, etc
         None if id == ast::DUMMY_NODE_ID => return (ast::DUMMY_NODE_ID, None),

trunk/src/librustc_trans/trans/controlflow.rs

@@ -112,7 +112,7 @@ pub fn trans_block<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
 
     if dest != expr::Ignore {
         let block_ty = node_id_type(bcx, b.id);
-        
+
         if b.expr.is_none() || type_is_zero_size(bcx.ccx(), block_ty) {
             dest = expr::Ignore;
         } else if b.expr.is_some() {

trunk/src/librustc_trans/trans/expr.rs

@@ -944,7 +944,7 @@ fn trans_rvalue_stmt_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
                 // it won't actually be used anyway.
                 if let &Some(ref x) = ex {
                     bcx = trans_into(bcx, &**x, Ignore);
-                } 
+                }
                 bcx
             }
         }