auto merge of #5182 : youknowone/rust/enum-cast, r=brson

author bors <bors@rust-lang.org>

Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)

committer bors <bors@rust-lang.org>

Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)
author bors <bors@rust-lang.org>
Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)
committer bors <bors@rust-lang.org>
Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)
diff --cc src/librustc/middle/trans/consts.rs
Simple merge
diff --cc src/librustc/middle/ty.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)
committer	bors <bors@rust-lang.org>
	Thu, 7 Mar 2013 00:51:47 +0000 (16:51 -0800)
		1	2
src/librustc/middle/trans/consts.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/ty.rs	patch \|	diff1 \|	diff2 \|	blob \| history