Alex Crichton 1506b34e0c rollup merge of #22286: nikomatsakis/variance-4b
Conflicts:
	src/librustc/middle/infer/combine.rs
	src/librustc_typeck/check/wf.rs
2015-02-18 15:52:01 -08:00
..
2015-02-18 00:57:35 +00:00
2015-02-18 10:25:28 -05:00
2015-02-02 23:37:01 +00:00