bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20645: nikomatsakis/rustbook-ice

Browse source 
Conflicts:
	src/librustc/middle/mem_categorization.rs
	src/librustc/middle/ty.rs
	src/librustc_trans/trans/base.rs
	src/librustc_trans/trans/expr.rs
	src/librustc_trans/trans/foreign.rs
	src/librustc_typeck/check/mod.rs
This commit is contained in:
Alex Crichton 2015-01-06 15:29:09 -08:00
commit 0b3b957554
23 changed files with 386 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/middle/cfg/construct.rs
View file

@ -514,7 +514,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
let func_or_rcvr_exit = self.expr(func_or_rcvr, pred);
let ret = self.straightline(call_expr, func_or_rcvr_exit, args);
if return_ty == ty::FnDiverging {
if return_ty.diverges() {
self.add_node(ast::DUMMY_NODE_ID, &[])
} else {
ret