From eadda7665eb31b1e7cb94a503b4d5cf5c75474c0 Mon Sep 17 00:00:00 2001
From: Murarth <murarth@gmail.com>
Date: Tue, 13 Jun 2017 15:52:59 -0700
Subject: Merge crate `collections` into `alloc`

---
 src/bootstrap/dist.rs | 3 +--
 src/bootstrap/doc.rs  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 26d44ae7693..1af60cbd801 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -376,8 +376,8 @@ pub fn debugger_scripts(build: &Build,
         install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"),
             0o755);
 
+        cp_debugger_script("natvis/liballoc.natvis");
         cp_debugger_script("natvis/libcore.natvis");
-        cp_debugger_script("natvis/libcollections.natvis");
     } else {
         cp_debugger_script("debugger_pretty_printers_common.py");
 
@@ -550,7 +550,6 @@ pub fn rust_src(build: &Build) {
         "src/liballoc_jemalloc",
         "src/liballoc_system",
         "src/libbacktrace",
-        "src/libcollections",
         "src/libcompiler_builtins",
         "src/libcore",
         "src/liblibc",
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index baee1ada508..fc75b6ff5c3 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -246,7 +246,7 @@ pub fn std(build: &Build, stage: u32, target: &str) {
     // for which docs must be built.
     if !build.config.compiler_docs {
         cargo.arg("--no-deps");
-        for krate in &["alloc", "collections", "core", "std", "std_unicode"] {
+        for krate in &["alloc", "core", "std", "std_unicode"] {
             cargo.arg("-p").arg(krate);
             // Create all crate output directories first to make sure rustdoc uses
             // relative links.
-- 
cgit 1.4.1-3-g733a5