about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorleonardo.yvens <leoyvens@gmail.com>2017-10-22 10:07:47 -0200
committerleonardo.yvens <leoyvens@gmail.com>2017-10-22 14:55:02 -0200
commit19aa23b6d332e693786fa51dbca87828bb884314 (patch)
treed689cc4e5e1cadf0d52683a6d05e75b22a626576 /src
parent942f31f5eacfc8cbd40c20bbcabc9d37add37410 (diff)
downloadrust-19aa23b6d332e693786fa51dbca87828bb884314.tar.gz
rust-19aa23b6d332e693786fa51dbca87828bb884314.zip
Remove deprecated `collections` crate.
This reverts commit 6484258f1749499d3e51685df867b3d460a7f0be.
Diffstat (limited to 'src')
-rw-r--r--src/Cargo.lock9
-rw-r--r--src/bootstrap/dist.rs1
-rw-r--r--src/doc/unstable-book/src/library-features/collections.md5
-rw-r--r--src/libcollections/Cargo.toml12
-rw-r--r--src/libcollections/lib.rs68
-rw-r--r--src/libstd/Cargo.toml1
6 files changed, 0 insertions, 96 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index d7e3fa1eaf7..a8bcea6d781 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -322,14 +322,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "collections"
-version = "0.0.0"
-dependencies = [
- "alloc 0.0.0",
- "core 0.0.0",
-]
-
-[[package]]
 name = "compiler_builtins"
 version = "0.0.0"
 dependencies = [
@@ -2137,7 +2129,6 @@ dependencies = [
  "alloc_jemalloc 0.0.0",
  "alloc_system 0.0.0",
  "build_helper 0.1.0",
- "collections 0.0.0",
  "compiler_builtins 0.0.0",
  "core 0.0.0",
  "libc 0.0.0",
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index e41f01ac834..e79f6e086ae 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -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",
diff --git a/src/doc/unstable-book/src/library-features/collections.md b/src/doc/unstable-book/src/library-features/collections.md
deleted file mode 100644
index 5c937833c9e..00000000000
--- a/src/doc/unstable-book/src/library-features/collections.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# `collections`
-
-This feature is internal to the Rust compiler and is not intended for general use.
-
-------------------------
diff --git a/src/libcollections/Cargo.toml b/src/libcollections/Cargo.toml
deleted file mode 100644
index 800e36161d2..00000000000
--- a/src/libcollections/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "collections"
-version = "0.0.0"
-
-[lib]
-name = "collections"
-path = "lib.rs"
-
-[dependencies]
-alloc = { path = "../liballoc" }
-core = { path = "../libcore" }
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
deleted file mode 100644
index 55316db3d5a..00000000000
--- a/src/libcollections/lib.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused_attributes)]
-#![unstable(feature = "collections",
-            reason = "this library is unlikely to be stabilized in its current \
-                      form or name",
-            issue = "27783")]
-#![rustc_deprecated(since = "1.20.0",
-                    reason = "collections moved to `alloc`")]
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
-       html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
-       html_root_url = "https://doc.rust-lang.org/nightly/",
-       issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
-       test(no_crate_inject, attr(allow(unused_variables), deny(warnings))))]
-#![no_std]
-#![deny(warnings)]
-
-#![feature(alloc)]
-#![feature(collections_range)]
-#![feature(macro_reexport)]
-#![feature(staged_api)]
-
-//! Collection types
-//!
-//! See [`std::collections`](../std/collections/index.html) for a detailed
-//! discussion of collections in Rust.
-
-#[macro_reexport(vec, format)]
-extern crate alloc;
-
-pub use alloc::Bound;
-
-pub use alloc::binary_heap;
-pub use alloc::borrow;
-pub use alloc::fmt;
-pub use alloc::linked_list;
-pub use alloc::range;
-pub use alloc::slice;
-pub use alloc::str;
-pub use alloc::string;
-pub use alloc::vec;
-pub use alloc::vec_deque;
-
-pub use alloc::btree_map;
-pub use alloc::btree_set;
-
-#[doc(no_inline)]
-pub use alloc::binary_heap::BinaryHeap;
-#[doc(no_inline)]
-pub use alloc::btree_map::BTreeMap;
-#[doc(no_inline)]
-pub use alloc::btree_set::BTreeSet;
-#[doc(no_inline)]
-pub use alloc::linked_list::LinkedList;
-#[doc(no_inline)]
-pub use alloc::vec_deque::VecDeque;
-#[doc(no_inline)]
-pub use alloc::string::String;
-#[doc(no_inline)]
-pub use alloc::vec::Vec;
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 866c0038a7f..5dd5f8953a0 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -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" }