]> git.lizzy.rs Git - rust.git/commit
Auto merge of #42648 - murarth:merge-alloc-collections, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 15 Jun 2017 12:37:54 +0000 (12:37 +0000)
committerbors <bors@rust-lang.org>
Thu, 15 Jun 2017 12:37:54 +0000 (12:37 +0000)
commit258ae6dd9b1a8ac97986852fc9f00f7687004ccb
tree96936d0ba5ed7f62d1603a5e765f11f203b136c1
parent16c27bf713ac7c0afeada808e274c73e10eb96bd
parenteadda7665eb31b1e7cb94a503b4d5cf5c75474c0
Auto merge of #42648 - murarth:merge-alloc-collections, r=alexcrichton

Merge crate `collections` into `alloc`

This is a necessary step in order to merge #42565
src/Cargo.lock
src/bootstrap/dist.rs
src/doc/unstable-book/src/SUMMARY.md
src/librustc_typeck/diagnostics.rs
src/libstd/Cargo.toml