]> git.lizzy.rs Git - rust.git/commit
Correct merge failures
authorNiko Matsakis <niko@alum.mit.edu>
Mon, 24 Jun 2013 17:30:35 +0000 (13:30 -0400)
committerNiko Matsakis <niko@alum.mit.edu>
Mon, 8 Jul 2013 17:55:11 +0000 (13:55 -0400)
commit979d3a54f9e1eea483734059a2f594278787e16a
treee385d1b804a9c3d44281570a3ac8a942b66786db
parentce602c66b8ff487ca74f074120419a18c9f25871
Correct merge failures
14 files changed:
src/libextra/fileinput.rs
src/libextra/num/bigint.rs
src/libextra/term.rs
src/librustc/middle/borrowck/gather_loans/mod.rs
src/librustc/middle/moves.rs
src/librustc/middle/trans/_match.rs
src/librustc/middle/trans/base.rs
src/librustc/middle/trans/callee.rs
src/librustc/middle/trans/meth.rs
src/libstd/vec.rs
src/libsyntax/print/pprust.rs
src/test/compile-fail/borrowck-move-out-of-struct-with-dtor.rs
src/test/compile-fail/borrowck-move-out-of-tuple-struct-with-dtor.rs
src/test/run-pass/reflect-visit-type.rs