Rollup merge of #40229 - cramertj:break-to-blocks, r=nikomatsakis

author Corey Farwell <coreyf@rwell.org>

Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)

committer GitHub <noreply@github.com>

Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)
author Corey Farwell <coreyf@rwell.org>
Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)
committer GitHub <noreply@github.com>
Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)
diff --cc src/librustc/hir/lowering.rs
Simple merge
diff --cc src/librustc_typeck/check/mod.rs
Simple merge
author	Corey Farwell <coreyf@rwell.org>
	Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)
committer	GitHub <noreply@github.com>
	Tue, 21 Mar 2017 03:44:55 +0000 (23:44 -0400)
		1	2
src/librustc/hir/lowering.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/check/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history