Rollup merge of #22961 - dotdash:branch_drop, r=eddyb

Manishearth · Manishearth · commit c9d54946403f · 2015-03-03T01:46:29.000+05:30
diff --git a/src/librustc_trans/trans/glue.rs b/src/librustc_trans/trans/glue.rs
@@ -313,8 +313,7 @@ fn trans_struct_drop<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
                                      ty::mk_nil(bcx.tcx()));
         let (_, variant_cx) = invoke(variant_cx, dtor_addr, &args[..], dtor_ty, DebugLoc::None);
 
-        variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope);
-        variant_cx
+        variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope)
     })
 }
 

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,7 @@ fn trans_struct_drop<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,`
`313`	`313`	`ty::mk_nil(bcx.tcx()));`
`314`	`314`	`let (_, variant_cx) = invoke(variant_cx, dtor_addr, &args[..], dtor_ty, DebugLoc::None);`
`315`	`315`
`316`		`- variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope);`
`317`		`- variant_cx`
	`316`	`+ variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope)`
`318`	`317`	`})`
`319`	`318`	`}`
`320`	`319`