about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-01 17:55:20 +0000
committerbors <bors@rust-lang.org>2015-07-01 17:55:20 +0000
commit8a599c8cef871d842eea0a6217cfce23093d09cf (patch)
treede6cc2dd27d9d9327e353ce3c87c9f1eeade859d /src/libcollections
parent9d67b9f0f90a43e822d09201291603fc0f7601b3 (diff)
parent7850c8d0aa14cd561fcdce816c94532a3d54ff60 (diff)
downloadrust-8a599c8cef871d842eea0a6217cfce23093d09cf.tar.gz
rust-8a599c8cef871d842eea0a6217cfce23093d09cf.zip
Auto merge of #26034 - Gankro:deprecate-bits, r=alexcrichton
I've mirrored them out to crates (bit-vec and bit-set) that build on stable.

(not sure if this actually correctly deprecates them in std)
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/bit.rs5
-rw-r--r--src/libcollections/lib.rs4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs
index 51914900fdd..a8d638028be 100644
--- a/src/libcollections/bit.rs
+++ b/src/libcollections/bit.rs
@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![deprecated(reason = "BitVec and BitSet have been migrated to cargo as bit-vec and bit-set",
+              since = "1.3.0")]
+#![unstable(feature = "collections", reason = "deprecated")]
+#![allow(deprecated)]
+
 // FIXME(Gankro): BitVec and BitSet are very tightly coupled. Ideally (for
 // maintenance), they should be in separate files/modules, with BitSet only
 // using BitVec's public API. This will be hard for performance though, because
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 8d0f57de4c5..42adbe10e50 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -77,7 +77,9 @@ extern crate alloc;
 #[cfg(test)] extern crate test;
 
 pub use binary_heap::BinaryHeap;
+#[allow(deprecated)]
 pub use bit_vec::BitVec;
+#[allow(deprecated)]
 pub use bit_set::BitSet;
 pub use btree_map::BTreeMap;
 pub use btree_set::BTreeSet;
@@ -111,11 +113,13 @@ pub mod vec_map;
 
 #[unstable(feature = "bitvec", reason = "RFC 509")]
 pub mod bit_vec {
+    #![allow(deprecated)]
     pub use bit::{BitVec, Iter};
 }
 
 #[unstable(feature = "bitset", reason = "RFC 509")]
 pub mod bit_set {
+    #![allow(deprecated)]
     pub use bit::{BitSet, Union, Intersection, Difference, SymmetricDifference};
     pub use bit::SetIter as Iter;
 }