From 7850c8d0aa14cd561fcdce816c94532a3d54ff60 Mon Sep 17 00:00:00 2001
From: Alexis Beingessner <a.beingessner@gmail.com>
Date: Tue, 30 Jun 2015 16:41:00 -0700
Subject: [PATCH] fallout of bitvec/bitset deprecation

---
 src/libcollections/bit.rs    | 2 +-
 src/libcollections/lib.rs    | 4 ++++
 src/librustc_lint/builtin.rs | 3 +++
 src/libsyntax/attr.rs        | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs
index 7e7481e4f2fd..a8d638028be3 100644
--- a/src/libcollections/bit.rs
+++ b/src/libcollections/bit.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![deprecated(reason = "BitVec and BitSet have been migrated to cargo as bit-vec and bit-set",
-              since = "1.2.0")]
+              since = "1.3.0")]
 #![unstable(feature = "collections", reason = "deprecated")]
 #![allow(deprecated)]
 
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 8d0f57de4c59..42adbe10e505 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;
 }
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index 190e2965e76c..577fe3979ddc 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -28,6 +28,9 @@
 //! Use the former for unit-like structs and the latter for structs with
 //! a `pub fn new()`.
 
+// BitSet
+#![allow(deprecated)]
+
 use metadata::{csearch, decoder};
 use middle::def::*;
 use middle::mem_categorization::Typer;
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 3ee8ffe3636a..3cc141106bb1 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -10,6 +10,9 @@
 
 // Functions dealing with attributes and meta items
 
+// BitSet
+#![allow(deprecated)]
+
 pub use self::StabilityLevel::*;
 pub use self::ReprAttr::*;
 pub use self::IntType::*;