]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #36030 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Sat, 27 Aug 2016 10:07:48 +0000 (03:07 -0700)
committerGitHub <noreply@github.com>
Sat, 27 Aug 2016 10:07:48 +0000 (03:07 -0700)
Rollup of 7 pull requests

- Successful merges: #35124, #35877, #35953, #36002, #36004, #36005, #36014
- Failed merges:

1  2 
src/librustc/mir/repr.rs
src/librustc/mir/visit.rs
src/librustc_borrowck/borrowck/mir/elaborate_drops.rs
src/librustc_metadata/decoder.rs
src/librustc_mir/transform/qualify_consts.rs
src/librustc_trans/collector.rs

Simple merge
Simple merge
Simple merge
Simple merge