]> git.lizzy.rs Git - rust.git/commit
fix conflicts
authorAriel Ben-Yehuda <ariel.byd@gmail.com>
Wed, 13 May 2015 18:58:26 +0000 (21:58 +0300)
committerAriel Ben-Yehuda <ariel.byd@gmail.com>
Tue, 19 May 2015 14:42:14 +0000 (17:42 +0300)
commitd9b9f4ee7de2b5a05547085382a7fc6e196f7c0d
tree12c7e4703910ca2f83f06fc30541c1029b61be3b
parent9ee2335bfcc6974e73b344b948b71cacc1fc5ea4
fix conflicts
src/liballoc/rc.rs
src/librustc_trans/trans/expr.rs
src/librustc_typeck/check/mod.rs
src/test/compile-fail/cast-rfc0401.rs
src/test/compile-fail/fat-ptr-cast.rs
src/test/run-pass/cast-rfc0401.rs
src/test/run-pass/fat-ptr-cast.rs