rollup merge of #21747: nikomatsakis/issue-21726-projection-subtyping

author Alex Crichton <alex@alexcrichton.com>

Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)

committer Alex Crichton <alex@alexcrichton.com>

Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)
author Alex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)
committer Alex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)
diff --cc src/librustc/middle/infer/combine.rs
Simple merge
diff --cc src/librustc_typeck/variance.rs
Simple merge
author	Alex Crichton <alex@alexcrichton.com>
	Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)
committer	Alex Crichton <alex@alexcrichton.com>
	Fri, 30 Jan 2015 20:03:29 +0000 (12:03 -0800)
		1	2
src/librustc/middle/infer/combine.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/variance.rs	patch \|	diff1 \|	diff2 \|	blob \| history