Skip to content

Commit f26b792

Browse files
committed
---
yaml --- r: 223471 b: refs/heads/beta c: 7850c8d h: refs/heads/master i: 223469: f7bd2c1 223467: 575fc67 223463: 1411312 223455: fd624d9 v: v3
1 parent 4670145 commit f26b792

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 8b25086f3dba6d2a452de009914ab5ae058a6d28
26+
refs/heads/beta: 7850c8d0aa14cd561fcdce816c94532a3d54ff60
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libcollections/bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![deprecated(reason = "BitVec and BitSet have been migrated to cargo as bit-vec and bit-set",
12-
since = "1.2.0")]
12+
since = "1.3.0")]
1313
#![unstable(feature = "collections", reason = "deprecated")]
1414
#![allow(deprecated)]
1515

branches/beta/src/libcollections/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ extern crate alloc;
7777
#[cfg(test)] extern crate test;
7878

7979
pub use binary_heap::BinaryHeap;
80+
#[allow(deprecated)]
8081
pub use bit_vec::BitVec;
82+
#[allow(deprecated)]
8183
pub use bit_set::BitSet;
8284
pub use btree_map::BTreeMap;
8385
pub use btree_set::BTreeSet;
@@ -111,11 +113,13 @@ pub mod vec_map;
111113

112114
#[unstable(feature = "bitvec", reason = "RFC 509")]
113115
pub mod bit_vec {
116+
#![allow(deprecated)]
114117
pub use bit::{BitVec, Iter};
115118
}
116119

117120
#[unstable(feature = "bitset", reason = "RFC 509")]
118121
pub mod bit_set {
122+
#![allow(deprecated)]
119123
pub use bit::{BitSet, Union, Intersection, Difference, SymmetricDifference};
120124
pub use bit::SetIter as Iter;
121125
}

branches/beta/src/librustc_lint/builtin.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
//! Use the former for unit-like structs and the latter for structs with
2929
//! a `pub fn new()`.
3030
31+
// BitSet
32+
#![allow(deprecated)]
33+
3134
use metadata::{csearch, decoder};
3235
use middle::def::*;
3336
use middle::mem_categorization::Typer;

branches/beta/src/libsyntax/attr.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
// Functions dealing with attributes and meta items
1212

13+
// BitSet
14+
#![allow(deprecated)]
15+
1316
pub use self::StabilityLevel::*;
1417
pub use self::ReprAttr::*;
1518
pub use self::IntType::*;

0 commit comments

Comments
 (0)