auto merge of #19858 : nick29581/rust/ranges, r=aturon

author bors <bors@rust-lang.org>

Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)

committer bors <bors@rust-lang.org>

Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)
author bors <bors@rust-lang.org>
Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)
committer bors <bors@rust-lang.org>
Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)
diff --cc src/librustc/middle/ty.rs
Simple merge
diff --cc src/librustc_typeck/check/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 24 Dec 2014 06:31:13 +0000 (06:31 +0000)
		1	2
src/librustc/middle/ty.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/check/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history