Auto merge of #34686 - alexcrichton:new-stage, r=luqmana

author bors <bors@rust-lang.org>

Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)

committer GitHub <noreply@github.com>

Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)
author bors <bors@rust-lang.org>
Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)
committer GitHub <noreply@github.com>
Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)
diff --cc src/libcore/intrinsics.rs
Simple merge
diff --cc src/librustc_const_eval/check_match.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)
committer	GitHub <noreply@github.com>
	Mon, 11 Jul 2016 18:29:52 +0000 (11:29 -0700)
		1	2
src/libcore/intrinsics.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_const_eval/check_match.rs	patch \|	diff1 \|	diff2 \|	blob \| history