about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-18 17:29:58 +0000
committerbors <bors@rust-lang.org>2017-06-18 17:29:58 +0000
commit247a0184ff972f1205017185f6917a03b15e7be4 (patch)
tree793deb872cd80120061280724c4d168d3b71d052 /src/libstd
parent28cc0c5a7b538452c7495b42b32e09b006c38b82 (diff)
parent3bed3bd146d3f306394da441fe4d34c724819e53 (diff)
Auto merge of #42738 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 7 pull requests

- Successful merges: #42695, #42714, #42720, #42723, #42730, #42731, #42734
- Failed merges: #42722
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/Cargo.toml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index f93af4c1920..b516cbd08ca 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -15,6 +15,7 @@ alloc_jemalloc = { path = "../liballoc_jemalloc", optional = true }
 alloc_system = { path = "../liballoc_system" }
 panic_unwind = { path = "../libpanic_unwind", optional = true }
 panic_abort = { path = "../libpanic_abort" }
+collections = { path = "../libcollections" }
 core = { path = "../libcore" }
 libc = { path = "../rustc/libc_shim" }
 rand = { path = "../librand" }