Rollup merge of #54816 - oli-obk:double_promotion, r=alexreg

author kennytm <kennytm@gmail.com>

Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)

committer GitHub <noreply@github.com>

Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)
author kennytm <kennytm@gmail.com>
Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)
committer GitHub <noreply@github.com>
Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)
diff --cc src/librustc_mir/transform/promote_consts.rs
Simple merge
diff --cc src/librustc_mir/transform/qualify_consts.rs
Simple merge
author	kennytm <kennytm@gmail.com>
	Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)
committer	GitHub <noreply@github.com>
	Fri, 26 Oct 2018 10:24:54 +0000 (18:24 +0800)
		1	2
src/librustc_mir/transform/promote_consts.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_mir/transform/qualify_consts.rs	patch \|	diff1 \|	diff2 \|	blob \| history