Skip to content

Commit 50942c7

Browse files
brsonalexcrichton
authored andcommitted
core: Rename container mod to collections. Closes #12543
Also renames the `Container` trait to `Collection`. [breaking-change]
1 parent 443a1cd commit 50942c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+64
-65
lines changed

src/libcollections/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ impl<S: hash::Writer> hash::Hash<S> for BitvSet {
857857
}
858858
}
859859

860-
impl Container for BitvSet {
860+
impl Collection for BitvSet {
861861
#[inline]
862862
fn len(&self) -> uint { self.size }
863863
}

src/libcollections/dlist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn link_with_prev<T>(mut next: Box<Node<T>>, prev: Rawlink<Node<T>>)
125125
Some(next)
126126
}
127127

128-
impl<T> Container for DList<T> {
128+
impl<T> Collection for DList<T> {
129129
/// O(1)
130130
#[inline]
131131
fn is_empty(&self) -> bool {

src/libcollections/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub struct PriorityQueue<T> {
2626
data: Vec<T>,
2727
}
2828

29-
impl<T: Ord> Container for PriorityQueue<T> {
29+
impl<T: Ord> Collection for PriorityQueue<T> {
3030
/// Returns the length of the queue
3131
fn len(&self) -> uint { self.data.len() }
3232
}

src/libcollections/ringbuf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub struct RingBuf<T> {
3333
elts: Vec<Option<T>>
3434
}
3535

36-
impl<T> Container for RingBuf<T> {
36+
impl<T> Collection for RingBuf<T> {
3737
/// Return the number of elements in the RingBuf
3838
fn len(&self) -> uint { self.nelts }
3939
}

src/libcollections/smallintmap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub struct SmallIntMap<T> {
2929
v: Vec<Option<T>>,
3030
}
3131

32-
impl<V> Container for SmallIntMap<V> {
32+
impl<V> Collection for SmallIntMap<V> {
3333
/// Return the number of elements in the map
3434
fn len(&self) -> uint {
3535
self.v.iter().filter(|elt| elt.is_some()).count()

src/libcollections/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ impl<'a> StrAllocating for MaybeOwned<'a> {
610610
}
611611
}
612612

613-
impl<'a> Container for MaybeOwned<'a> {
613+
impl<'a> Collection for MaybeOwned<'a> {
614614
#[inline]
615615
fn len(&self) -> uint { self.as_slice().len() }
616616
}
@@ -2036,7 +2036,7 @@ mod tests {
20362036

20372037
#[test]
20382038
fn test_str_container() {
2039-
fn sum_len<S: Container>(v: &[S]) -> uint {
2039+
fn sum_len<S: Collection>(v: &[S]) -> uint {
20402040
v.iter().map(|x| x.len()).sum()
20412041
}
20422042

src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ impl String {
279279
}
280280
}
281281

282-
impl Container for String {
282+
impl Collection for String {
283283
#[inline]
284284
fn len(&self) -> uint {
285285
self.vec.len()

src/libcollections/treemap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl<K: Ord + Show, V: Show> Show for TreeMap<K, V> {
8686
}
8787
}
8888

89-
impl<K: Ord, V> Container for TreeMap<K, V> {
89+
impl<K: Ord, V> Collection for TreeMap<K, V> {
9090
fn len(&self) -> uint { self.length }
9191
}
9292

@@ -579,7 +579,7 @@ impl<T: Ord + Show> Show for TreeSet<T> {
579579
}
580580
}
581581

582-
impl<T: Ord> Container for TreeSet<T> {
582+
impl<T: Ord> Collection for TreeSet<T> {
583583
#[inline]
584584
fn len(&self) -> uint { self.map.len() }
585585
}

src/libcollections/trie.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct TrieMap<T> {
3838
length: uint
3939
}
4040

41-
impl<T> Container for TrieMap<T> {
41+
impl<T> Collection for TrieMap<T> {
4242
/// Return the number of elements in the map
4343
#[inline]
4444
fn len(&self) -> uint { self.length }
@@ -285,7 +285,7 @@ pub struct TrieSet {
285285
map: TrieMap<()>
286286
}
287287

288-
impl Container for TrieSet {
288+
impl Collection for TrieSet {
289289
/// Return the number of elements in the set
290290
#[inline]
291291
fn len(&self) -> uint { self.map.len() }

src/libcollections/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ impl<T: Ord> Ord for Vec<T> {
393393
}
394394
}
395395

396-
impl<T> Container for Vec<T> {
396+
impl<T> Collection for Vec<T> {
397397
#[inline]
398398
fn len(&self) -> uint {
399399
self.len

0 commit comments

Comments
 (0)