diff options
| author | bors <bors@rust-lang.org> | 2017-06-15 12:37:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-15 12:37:54 +0000 |
| commit | 258ae6dd9b1a8ac97986852fc9f00f7687004ccb (patch) | |
| tree | 96936d0ba5ed7f62d1603a5e765f11f203b136c1 /src/bootstrap | |
| parent | 16c27bf713ac7c0afeada808e274c73e10eb96bd (diff) | |
| parent | eadda7665eb31b1e7cb94a503b4d5cf5c75474c0 (diff) | |
| download | rust-258ae6dd9b1a8ac97986852fc9f00f7687004ccb.tar.gz rust-258ae6dd9b1a8ac97986852fc9f00f7687004ccb.zip | |
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
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/doc.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index ebf602373c9..4d58620ca64 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. |