Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eadda76

Browse files
committedJun 14, 2017
Merge crate collections into alloc
1 parent e40ef96 commit eadda76

File tree

97 files changed

+2347
-2516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2347
-2516
lines changed
 

‎src/Cargo.lock

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/dist.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@ pub fn debugger_scripts(build: &Build,
376376
install(&build.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"),
377377
0o755);
378378

379+
cp_debugger_script("natvis/liballoc.natvis");
379380
cp_debugger_script("natvis/libcore.natvis");
380-
cp_debugger_script("natvis/libcollections.natvis");
381381
} else {
382382
cp_debugger_script("debugger_pretty_printers_common.py");
383383

@@ -550,7 +550,6 @@ pub fn rust_src(build: &Build) {
550550
"src/liballoc_jemalloc",
551551
"src/liballoc_system",
552552
"src/libbacktrace",
553-
"src/libcollections",
554553
"src/libcompiler_builtins",
555554
"src/libcore",
556555
"src/liblibc",

0 commit comments

Comments
 (0)
Please sign in to comment.