]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #20385: nick29581/x-object
authorAlex Crichton <alex@alexcrichton.com>
Fri, 2 Jan 2015 17:22:35 +0000 (09:22 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 2 Jan 2015 17:22:35 +0000 (09:22 -0800)
Closes #19056

1  2 
src/librustc/metadata/decoder.rs
src/librustc/metadata/encoder.rs
src/librustc/middle/ty.rs
src/librustc_typeck/check/method/probe.rs

Simple merge
Simple merge
Simple merge