Skip to content

Commit 7d49e63

Browse files
committed
Implement RFC 580
This commit implements RFC 580 by renaming: * DList -> LinkedList * Bitv -> BitVec * BitvSet -> BitSet * RingBuf -> VecDeque More details are in [the RFC](rust-lang/rfcs#580) [breaking-change]
1 parent dfc5c0f commit 7d49e63

File tree

13 files changed

+916
-875
lines changed

13 files changed

+916
-875
lines changed

src/libcollections/bit.rs

Lines changed: 527 additions & 519 deletions
Large diffs are not rendered by default.

src/libcollections/btree/map.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use core::ops::{Index, IndexMut};
2929
use core::{iter, fmt, mem};
3030
use Bound::{self, Included, Excluded, Unbounded};
3131

32-
use ring_buf::RingBuf;
32+
use vec_deque::VecDeque;
3333

3434
use self::Continuation::{Continue, Finished};
3535
use self::StackOp::*;
@@ -75,7 +75,7 @@ pub struct BTreeMap<K, V> {
7575

7676
/// An abstract base over-which all other BTree iterators are built.
7777
struct AbsIter<T> {
78-
traversals: RingBuf<T>,
78+
traversals: VecDeque<T>,
7979
size: usize,
8080
}
8181

@@ -1189,7 +1189,7 @@ impl<K, V> BTreeMap<K, V> {
11891189
pub fn iter(&self) -> Iter<K, V> {
11901190
let len = self.len();
11911191
// NB. The initial capacity for ringbuf is large enough to avoid reallocs in many cases.
1192-
let mut lca = RingBuf::new();
1192+
let mut lca = VecDeque::new();
11931193
lca.push_back(Traverse::traverse(&self.root));
11941194
Iter {
11951195
inner: AbsIter {
@@ -1221,7 +1221,7 @@ impl<K, V> BTreeMap<K, V> {
12211221
#[stable(feature = "rust1", since = "1.0.0")]
12221222
pub fn iter_mut(&mut self) -> IterMut<K, V> {
12231223
let len = self.len();
1224-
let mut lca = RingBuf::new();
1224+
let mut lca = VecDeque::new();
12251225
lca.push_back(Traverse::traverse(&mut self.root));
12261226
IterMut {
12271227
inner: AbsIter {
@@ -1250,7 +1250,7 @@ impl<K, V> BTreeMap<K, V> {
12501250
#[stable(feature = "rust1", since = "1.0.0")]
12511251
pub fn into_iter(self) -> IntoIter<K, V> {
12521252
let len = self.len();
1253-
let mut lca = RingBuf::new();
1253+
let mut lca = VecDeque::new();
12541254
lca.push_back(Traverse::traverse(self.root));
12551255
IntoIter {
12561256
inner: AbsIter {
@@ -1342,7 +1342,7 @@ macro_rules! range_impl {
13421342
// A deque that encodes two search paths containing (left-to-right):
13431343
// a series of truncated-from-the-left iterators, the LCA's doubly-truncated iterator,
13441344
// and a series of truncated-from-the-right iterators.
1345-
let mut traversals = RingBuf::new();
1345+
let mut traversals = VecDeque::new();
13461346
let (root, min, max) = ($root, $min, $max);
13471347

13481348
let mut leftmost = None;

src/libcollections/lib.rs

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,33 @@ extern crate alloc;
4949
#[cfg(test)] #[macro_use] extern crate log;
5050

5151
pub use binary_heap::BinaryHeap;
52-
pub use bitv::Bitv;
53-
pub use bitv_set::BitvSet;
52+
pub use bit_vec::BitVec;
53+
pub use bit_set::BitSet;
5454
pub use btree_map::BTreeMap;
5555
pub use btree_set::BTreeSet;
56-
pub use dlist::DList;
56+
pub use linked_list::LinkedList;
5757
pub use enum_set::EnumSet;
58-
pub use ring_buf::RingBuf;
58+
pub use vec_deque::VecDeque;
5959
pub use string::String;
6060
pub use vec::Vec;
6161
pub use vec_map::VecMap;
6262

63+
#[deprecated(since = "1.0.0", reason = "renamed to vec_deque")]
64+
#[unstable(feature = "collections")]
65+
pub use vec_deque as ring_buf;
66+
67+
#[deprecated(since = "1.0.0", reason = "renamed to linked_list")]
68+
#[unstable(feature = "collections")]
69+
pub use linked_list as dlist;
70+
71+
#[deprecated(since = "1.0.0", reason = "renamed to bit_vec")]
72+
#[unstable(feature = "collections")]
73+
pub use bit_vec as bitv;
74+
75+
#[deprecated(since = "1.0.0", reason = "renamed to bit_set")]
76+
#[unstable(feature = "collections")]
77+
pub use bit_set as bitv_set;
78+
6379
// Needed for the vec! macro
6480
pub use alloc::boxed;
6581

@@ -71,10 +87,10 @@ mod macros;
7187
pub mod binary_heap;
7288
mod bit;
7389
mod btree;
74-
pub mod dlist;
90+
pub mod linked_list;
7591
pub mod enum_set;
7692
pub mod fmt;
77-
pub mod ring_buf;
93+
pub mod vec_deque;
7894
pub mod slice;
7995
pub mod str;
8096
pub mod string;
@@ -83,15 +99,23 @@ pub mod vec_map;
8399

84100
#[unstable(feature = "collections",
85101
reason = "RFC 509")]
86-
pub mod bitv {
87-
pub use bit::{Bitv, Iter};
102+
pub mod bit_vec {
103+
pub use bit::{BitVec, Iter};
104+
105+
#[deprecated(since = "1.0.0", reason = "renamed to BitVec")]
106+
#[unstable(feature = "collections")]
107+
pub use bit::BitVec as Bitv;
88108
}
89109

90110
#[unstable(feature = "collections",
91111
reason = "RFC 509")]
92-
pub mod bitv_set {
93-
pub use bit::{BitvSet, Union, Intersection, Difference, SymmetricDifference};
112+
pub mod bit_set {
113+
pub use bit::{BitSet, Union, Intersection, Difference, SymmetricDifference};
94114
pub use bit::SetIter as Iter;
115+
116+
#[deprecated(since = "1.0.0", reason = "renamed to BitSet")]
117+
#[unstable(feature = "collections")]
118+
pub use bit::BitSet as BitvSet;
95119
}
96120

97121
#[stable(feature = "rust1", since = "1.0.0")]

0 commit comments

Comments
 (0)