Skip to content

Commit

Permalink
Auto merge of #45446 - leodasvacas:remove-libcollections, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove deprecated `collections` crate.

The real `collections` was merged with `alloc`, this facade was introduced [in this PR](#42720) to give `#[no_std]` users time to adapt. This was done at least two cycles ago, now we can consider removing it for good.
  • Loading branch information
bors committed Oct 24, 2017
2 parents 61af754 + 170f63e commit c2799fc
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 97 deletions.
9 changes: 0 additions & 9 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,6 @@ impl Step for Src {
"src/liballoc_jemalloc",
"src/liballoc_system",
"src/libbacktrace",
"src/libcollections",
"src/libcompiler_builtins",
"src/libcore",
"src/liblibc",
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ impl Step for Std {
// 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.
Expand Down
5 changes: 0 additions & 5 deletions src/doc/unstable-book/src/library-features/collections.md

This file was deleted.

12 changes: 0 additions & 12 deletions src/libcollections/Cargo.toml

This file was deleted.

68 changes: 0 additions & 68 deletions src/libcollections/lib.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/libstd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ 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" }
Expand Down

0 comments on commit c2799fc

Please sign in to comment.