]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #18235 : nikomatsakis/issue-18209
authorAlex Crichton <alex@alexcrichton.com>
Mon, 27 Oct 2014 16:06:43 +0000 (09:06 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 27 Oct 2014 19:53:01 +0000 (12:53 -0700)
1  2 
src/librustc/middle/traits/select.rs
src/librustc/middle/ty.rs

Simple merge
Simple merge