]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #18413 : bkoropoff/issue-18412
authorAlex Crichton <alex@alexcrichton.com>
Thu, 30 Oct 2014 15:57:40 +0000 (08:57 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 30 Oct 2014 16:29:24 +0000 (09:29 -0700)
1  2 
src/librustc/middle/trans/expr.rs
src/librustc/middle/ty.rs

Simple merge
Simple merge