Rollup merge of #59430 - kenta7777:rename-evalcontext-to-interpretcx, r=oli-obk

author Josh Stone <cuviper@gmail.com>

Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)

committer GitHub <noreply@github.com>

Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)
author Josh Stone <cuviper@gmail.com>
Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)
committer GitHub <noreply@github.com>
Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)
diff --cc src/librustc_mir/interpret/place.rs
Simple merge
diff --cc src/librustc_mir/transform/const_prop.rs
Simple merge
author	Josh Stone <cuviper@gmail.com>
	Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)
committer	GitHub <noreply@github.com>
	Thu, 28 Mar 2019 01:15:36 +0000 (18:15 -0700)
		1	2
src/librustc_mir/interpret/place.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_mir/transform/const_prop.rs	patch \|	diff1 \|	diff2 \|	blob \| history