core: Rename `container` mod to `collections`. Closes #12543
Also renames the `Container` trait to `Collection`.
[breaking-change]
diff --git a/src/libcollections/bitv.rs b/src/libcollections/bitv.rs
index 79e0c2f..ac31fbb 100644
--- a/src/libcollections/bitv.rs
+++ b/src/libcollections/bitv.rs
@@ -857,7 +857,7 @@
}
}
-impl Container for BitvSet {
+impl Collection for BitvSet {
#[inline]
fn len(&self) -> uint { self.size }
}
diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs
index 9d0e8e8..f71cc74 100644
--- a/src/libcollections/dlist.rs
+++ b/src/libcollections/dlist.rs
@@ -125,7 +125,7 @@
Some(next)
}
-impl<T> Container for DList<T> {
+impl<T> Collection for DList<T> {
/// O(1)
#[inline]
fn is_empty(&self) -> bool {
diff --git a/src/libcollections/priority_queue.rs b/src/libcollections/priority_queue.rs
index 34d6bbb..f10c6f2 100644
--- a/src/libcollections/priority_queue.rs
+++ b/src/libcollections/priority_queue.rs
@@ -26,7 +26,7 @@
data: Vec<T>,
}
-impl<T: Ord> Container for PriorityQueue<T> {
+impl<T: Ord> Collection for PriorityQueue<T> {
/// Returns the length of the queue
fn len(&self) -> uint { self.data.len() }
}
diff --git a/src/libcollections/ringbuf.rs b/src/libcollections/ringbuf.rs
index ce41957..5708dfa 100644
--- a/src/libcollections/ringbuf.rs
+++ b/src/libcollections/ringbuf.rs
@@ -33,7 +33,7 @@
elts: Vec<Option<T>>
}
-impl<T> Container for RingBuf<T> {
+impl<T> Collection for RingBuf<T> {
/// Return the number of elements in the RingBuf
fn len(&self) -> uint { self.nelts }
}
diff --git a/src/libcollections/smallintmap.rs b/src/libcollections/smallintmap.rs
index 45584dd..c61f518 100644
--- a/src/libcollections/smallintmap.rs
+++ b/src/libcollections/smallintmap.rs
@@ -29,7 +29,7 @@
v: Vec<Option<T>>,
}
-impl<V> Container for SmallIntMap<V> {
+impl<V> Collection for SmallIntMap<V> {
/// Return the number of elements in the map
fn len(&self) -> uint {
self.v.iter().filter(|elt| elt.is_some()).count()
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index 5fd133b..102d9c3 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -610,7 +610,7 @@
}
}
-impl<'a> Container for MaybeOwned<'a> {
+impl<'a> Collection for MaybeOwned<'a> {
#[inline]
fn len(&self) -> uint { self.as_slice().len() }
}
@@ -2036,7 +2036,7 @@
#[test]
fn test_str_container() {
- fn sum_len<S: Container>(v: &[S]) -> uint {
+ fn sum_len<S: Collection>(v: &[S]) -> uint {
v.iter().map(|x| x.len()).sum()
}
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
index bd39c74..1c1d4b9 100644
--- a/src/libcollections/string.rs
+++ b/src/libcollections/string.rs
@@ -279,7 +279,7 @@
}
}
-impl Container for String {
+impl Collection for String {
#[inline]
fn len(&self) -> uint {
self.vec.len()
diff --git a/src/libcollections/treemap.rs b/src/libcollections/treemap.rs
index def1c35..8d47228 100644
--- a/src/libcollections/treemap.rs
+++ b/src/libcollections/treemap.rs
@@ -86,7 +86,7 @@
}
}
-impl<K: Ord, V> Container for TreeMap<K, V> {
+impl<K: Ord, V> Collection for TreeMap<K, V> {
fn len(&self) -> uint { self.length }
}
@@ -579,7 +579,7 @@
}
}
-impl<T: Ord> Container for TreeSet<T> {
+impl<T: Ord> Collection for TreeSet<T> {
#[inline]
fn len(&self) -> uint { self.map.len() }
}
diff --git a/src/libcollections/trie.rs b/src/libcollections/trie.rs
index c15a6e9..1c6b7ed 100644
--- a/src/libcollections/trie.rs
+++ b/src/libcollections/trie.rs
@@ -38,7 +38,7 @@
length: uint
}
-impl<T> Container for TrieMap<T> {
+impl<T> Collection for TrieMap<T> {
/// Return the number of elements in the map
#[inline]
fn len(&self) -> uint { self.length }
@@ -285,7 +285,7 @@
map: TrieMap<()>
}
-impl Container for TrieSet {
+impl Collection for TrieSet {
/// Return the number of elements in the set
#[inline]
fn len(&self) -> uint { self.map.len() }
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index 37546f6..3d0182a 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -393,7 +393,7 @@
}
}
-impl<T> Container for Vec<T> {
+impl<T> Collection for Vec<T> {
#[inline]
fn len(&self) -> uint {
self.len
diff --git a/src/libcore/container.rs b/src/libcore/collections.rs
similarity index 94%
rename from src/libcore/container.rs
rename to src/libcore/collections.rs
index e8ee379..8ebc7c2 100644
--- a/src/libcore/container.rs
+++ b/src/libcore/collections.rs
@@ -8,13 +8,13 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-//! Traits for generic containers (including `Map` and `Set`)
+//! Traits for generic collections (including `Map` and `Set`)
use option::Option;
/// A trait to represent the abstract idea of a container. The only concrete
/// knowledge known is the number of elements contained within.
-pub trait Container {
+pub trait Collection {
/// Return the number of elements in the container
fn len(&self) -> uint;
@@ -26,14 +26,14 @@
}
/// A trait to represent mutable containers
-pub trait Mutable: Container {
+pub trait Mutable: Collection {
/// Clear the container, removing all values.
fn clear(&mut self);
}
/// A map is a key-value store where values may be looked up by their keys. This
/// trait provides basic operations to operate on these stores.
-pub trait Map<K, V>: Container {
+pub trait Map<K, V>: Collection {
/// Return a reference to the value corresponding to the key
fn find<'a>(&'a self, key: &K) -> Option<&'a V>;
@@ -76,7 +76,7 @@
/// A set is a group of objects which are each distinct from one another. This
/// trait represents actions which can be performed on sets to iterate over
/// them.
-pub trait Set<T>: Container {
+pub trait Set<T>: Collection {
/// Return true if the set contains a value
fn contains(&self, value: &T) -> bool;
diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs
index e5fb148..f326195 100644
--- a/src/libcore/fmt/float.rs
+++ b/src/libcore/fmt/float.rs
@@ -11,7 +11,7 @@
#![allow(missing_doc)]
use char;
-use container::Container;
+use collections::Collection;
use fmt;
use iter::{Iterator, range, DoubleEndedIterator};
use num::{Float, FPNaN, FPInfinite, ToPrimitive, Primitive};
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 2cce68d..37ef325 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -15,7 +15,7 @@
use any;
use cell::Cell;
use char::Char;
-use container::Container;
+use collections::Collection;
use iter::{Iterator, range};
use kinds::Copy;
use mem;
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
index 890733d..f36acf3 100644
--- a/src/libcore/fmt/num.rs
+++ b/src/libcore/fmt/num.rs
@@ -14,7 +14,7 @@
#![allow(unsigned_negate)]
-use container::Container;
+use collections::Collection;
use fmt;
use iter::{Iterator, DoubleEndedIterator};
use num::{Int, cast, zero};
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 2ccf431..5661c66 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -108,7 +108,7 @@
#[cfg(not(test))] pub mod cmp;
pub mod clone;
pub mod default;
-pub mod container;
+pub mod collections;
/* Core types and methods on primitives */
diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
index a6a8319..df9c0e6 100644
--- a/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@ -47,7 +47,7 @@
pub use clone::Clone;
pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
pub use cmp::{Ordering, Less, Equal, Greater, Equiv};
-pub use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
+pub use collections::Collection;
pub use iter::{FromIterator, Extendable};
pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator};
pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize};
diff --git a/src/libcore/should_not_exist.rs b/src/libcore/should_not_exist.rs
index 2c6f297..ed6b73d 100644
--- a/src/libcore/should_not_exist.rs
+++ b/src/libcore/should_not_exist.rs
@@ -25,7 +25,7 @@
// Currently, no progress has been made on this list.
use clone::Clone;
-use container::Container;
+use collections::Collection;
use finally::try_finally;
use intrinsics;
use iter::{range, Iterator};
diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs
index 4dea1fd..585373ec 100644
--- a/src/libcore/slice.rs
+++ b/src/libcore/slice.rs
@@ -16,7 +16,7 @@
use mem::transmute;
use clone::Clone;
-use container::Container;
+use collections::Collection;
use cmp::{PartialEq, Ord, Ordering, Less, Equal, Greater};
use cmp;
use default::Default;
@@ -253,7 +253,7 @@
use cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering, Equiv};
use iter::order;
- use container::Container;
+ use collections::Collection;
impl<'a,T:PartialEq> PartialEq for &'a [T] {
fn eq(&self, other: & &'a [T]) -> bool {
@@ -347,7 +347,7 @@
fn as_slice<'a>(&'a self) -> &'a [T] { let v: &'a [T] = *self; v }
}
-impl<'a, T> Container for &'a [T] {
+impl<'a, T> Collection for &'a [T] {
/// Returns the length of a vector
#[inline]
fn len(&self) -> uint {
@@ -355,7 +355,7 @@
}
}
-impl<T> Container for ~[T] {
+impl<T> Collection for ~[T] {
/// Returns the length of a vector
#[inline]
fn len(&self) -> uint {
@@ -1205,7 +1205,7 @@
/// Operations on `[u8]`.
pub mod bytes {
- use container::Container;
+ use collections::Collection;
use ptr;
use slice::MutableVector;
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 87177b4..c01997f 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -19,7 +19,7 @@
use clone::Clone;
use cmp;
use cmp::{PartialEq, Eq};
-use container::Container;
+use collections::Collection;
use default::Default;
use iter::{Filter, Map, Iterator};
use iter::{DoubleEndedIterator, ExactSize};
@@ -866,7 +866,7 @@
/// Unsafe operations
pub mod raw {
use mem;
- use container::Container;
+ use collections::Collection;
use ptr::RawPtr;
use raw::Slice;
use slice::{ImmutableVector};
@@ -930,8 +930,8 @@
#[cfg(not(test))]
#[allow(missing_doc)]
pub mod traits {
- use container::Container;
use cmp::{Ord, Ordering, Less, Equal, Greater, PartialEq, PartialOrd, Equiv, Eq};
+ use collections::Collection;
use iter::Iterator;
use option::{Some, None};
use str::{Str, StrSlice, eq_slice};
@@ -987,7 +987,7 @@
fn as_slice<'a>(&'a self) -> &'a str { *self }
}
-impl<'a> Container for &'a str {
+impl<'a> Collection for &'a str {
#[inline]
fn len(&self) -> uint {
self.repr().len
diff --git a/src/libregex/re.rs b/src/libregex/re.rs
index fbe0359..a499c1e 100644
--- a/src/libregex/re.rs
+++ b/src/libregex/re.rs
@@ -775,7 +775,7 @@
}
}
-impl<'t> Container for Captures<'t> {
+impl<'t> Collection for Captures<'t> {
/// Returns the number of captured groups.
#[inline]
fn len(&self) -> uint {
diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs
index 5f51f802..9fe4031 100644
--- a/src/librustc/middle/trans/adt.rs
+++ b/src/librustc/middle/trans/adt.rs
@@ -45,7 +45,6 @@
#![allow(unsigned_negate)]
-use std::container::Map;
use libc::c_ulonglong;
use std::num::{Bitwise};
use std::rc::Rc;
diff --git a/src/librustrt/c_str.rs b/src/librustrt/c_str.rs
index 4234c08..b4d9ac7 100644
--- a/src/librustrt/c_str.rs
+++ b/src/librustrt/c_str.rs
@@ -229,7 +229,7 @@
}
}
-impl Container for CString {
+impl Collection for CString {
/// Return the number of bytes in the CString (not including the NUL terminator).
///
/// # Failure
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index e9bb23a..b9edc9a 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -10,7 +10,7 @@
//! Operations on ASCII strings and characters
-use container::Container;
+use collections::Collection;
use fmt;
use iter::Iterator;
use mem;
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs
index 817b54f..e8a158a 100644
--- a/src/libstd/c_vec.rs
+++ b/src/libstd/c_vec.rs
@@ -33,7 +33,7 @@
//! handled correctly, i.e. that allocated memory is eventually freed
//! if necessary.
-use container::Container;
+use collections::Collection;
use kinds::Send;
use mem;
use ops::Drop;
@@ -149,7 +149,7 @@
}
}
-impl<T> Container for CVec<T> {
+impl<T> Collection for CVec<T> {
fn len(&self) -> uint { self.len }
}
diff --git a/src/libstd/collections/hashmap.rs b/src/libstd/collections/hashmap.rs
index 571c579..1f3c346 100644
--- a/src/libstd/collections/hashmap.rs
+++ b/src/libstd/collections/hashmap.rs
@@ -1504,7 +1504,7 @@
impl<T: Eq + Hash<S>, S, H: Hasher<S>> Eq for HashSet<T, H> {}
-impl<T: Eq + Hash<S>, S, H: Hasher<S>> Container for HashSet<T, H> {
+impl<T: Eq + Hash<S>, S, H: Hasher<S>> Collection for HashSet<T, H> {
fn len(&self) -> uint { self.map.len() }
}
@@ -2159,8 +2159,8 @@
use prelude::*;
use super::HashSet;
- use container::Container;
use slice::ImmutableEqVector;
+ use std::collections::Collection;
#[test]
fn test_disjoint() {
diff --git a/src/libstd/collections/lru_cache.rs b/src/libstd/collections/lru_cache.rs
index a12b00f..5f32abf 100644
--- a/src/libstd/collections/lru_cache.rs
+++ b/src/libstd/collections/lru_cache.rs
@@ -227,7 +227,7 @@
}
}
-impl<K: Hash + Eq, V> Container for LruCache<K, V> {
+impl<K: Hash + Eq, V> Collection for LruCache<K, V> {
/// Return the number of key-value pairs in the cache.
fn len(&self) -> uint {
self.map.len()
diff --git a/src/libstd/comm/sync.rs b/src/libstd/comm/sync.rs
index 7fe5055..84ef6d0 100644
--- a/src/libstd/comm/sync.rs
+++ b/src/libstd/comm/sync.rs
@@ -33,7 +33,7 @@
/// of a synchronous channel. There are a few branches for the unbuffered case,
/// but they're mostly just relevant to blocking senders.
-use container::Container;
+use collections::Collection;
use iter::Iterator;
use kinds::Send;
use mem;
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 0d42176..9450f77 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -11,7 +11,7 @@
//! Buffering wrappers for I/O traits
use cmp;
-use container::Container;
+use collections::Collection;
use io::{Reader, Writer, Stream, Buffer, DEFAULT_BUF_SIZE, IoResult};
use iter::ExactSize;
use ops::Drop;
diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs
index 45f7836..a06d5aa 100644
--- a/src/libstd/io/comm_adapters.rs
+++ b/src/libstd/io/comm_adapters.rs
@@ -10,7 +10,7 @@
use clone::Clone;
use cmp;
-use container::Container;
+use collections::Collection;
use comm::{Sender, Receiver};
use io;
use option::{None, Option, Some};
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs
index 29afd2b..d61518d 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -15,7 +15,7 @@
// FIXME: Not sure how this should be structured
// FIXME: Iteration should probably be considered separately
-use container::Container;
+use collections::Collection;
use iter::Iterator;
use option::{Option, Some, None};
use result::{Ok, Err};
@@ -504,7 +504,7 @@
mod bench {
extern crate test;
- use container::Container;
+ use collections::Collection;
use prelude::*;
use self::test::Bencher;
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index 49e8d37..5259200 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -51,7 +51,7 @@
use c_str::ToCStr;
use clone::Clone;
-use container::Container;
+use collections::Collection;
use io;
use iter::Iterator;
use kinds::Send;
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 735966d..f0fbe45 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -11,7 +11,7 @@
//! Readers and Writers for in-memory buffers
use cmp::min;
-use container::Container;
+use collections::Collection;
use option::None;
use result::{Err, Ok};
use io;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 7b65569..6f3eec0 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -214,7 +214,7 @@
#![deny(unused_must_use)]
use char::Char;
-use container::Container;
+use collections::Collection;
use fmt;
use int;
use iter::Iterator;
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index bdc4b60..2c54bd8 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -15,7 +15,7 @@
#![allow(missing_doc)]
-use container::Container;
+use collections::Collection;
use fmt;
use from_str::FromStr;
use iter::Iterator;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index bac4d26..d319d6b 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -144,7 +144,7 @@
pub use core::char;
pub use core::clone;
#[cfg(not(test))] pub use core::cmp;
-pub use core::container;
+pub use core::collections;
pub use core::default;
pub use core::finally;
pub use core::intrinsics;
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index 48962ca..5028987 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -12,7 +12,7 @@
use char;
use clone::Clone;
-use container::Container;
+use collections::Collection;
use num::{NumCast, Zero, One, cast, Int};
use num::{Float, FPNaN, FPInfinite, ToPrimitive};
use num;
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index dd692d3..90df181 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -30,7 +30,7 @@
#![allow(non_snake_case_functions)]
use clone::Clone;
-use container::Container;
+use collections::Collection;
use fmt;
use iter::Iterator;
use libc::{c_void, c_int};
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs
index 681b19a..a101f04 100644
--- a/src/libstd/path/mod.rs
+++ b/src/libstd/path/mod.rs
@@ -65,7 +65,7 @@
#![deny(deprecated_owned_vector)]
-use container::Container;
+use collections::Collection;
use c_str::CString;
use clone::Clone;
use fmt;
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 9bb137e..011dfa6 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -14,7 +14,7 @@
use c_str::{CString, ToCStr};
use clone::Clone;
use cmp::{PartialEq, Eq};
-use container::Container;
+use collections::Collection;
use from_str::FromStr;
use hash;
use io::Writer;
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index 766901f..d52c63a 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -13,7 +13,7 @@
#![allow(non_camel_case_types)]
use char::Char;
-use container::Container;
+use collections::Collection;
use from_str::from_str;
use io::{IoResult, Writer};
use iter::Iterator;
@@ -348,7 +348,7 @@
#[cfg(not(target_os = "macos"))]
fn print(w: &mut Writer, idx: int, addr: *libc::c_void) -> IoResult<()> {
- use container::Container;
+ use collections::Collection;
use iter::Iterator;
use os;
use path::GenericPath;
diff --git a/src/libsyntax/owned_slice.rs b/src/libsyntax/owned_slice.rs
index 28d63ea..016dd87 100644
--- a/src/libsyntax/owned_slice.rs
+++ b/src/libsyntax/owned_slice.rs
@@ -121,7 +121,7 @@
impl<T: Eq> Eq for OwnedSlice<T> {}
-impl<T> Container for OwnedSlice<T> {
+impl<T> Collection for OwnedSlice<T> {
fn len(&self) -> uint { self.len }
}
diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs
index 693407b..a3b2c23 100644
--- a/src/libsyntax/util/small_vector.rs
+++ b/src/libsyntax/util/small_vector.rs
@@ -23,7 +23,7 @@
Many(Vec<T> ),
}
-impl<T> Container for SmallVector<T> {
+impl<T> Collection for SmallVector<T> {
fn len(&self) -> uint {
match self.repr {
Zero => 0,
diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs
index 0c9a7cc..61c26d4 100644
--- a/src/test/compile-fail/map-types.rs
+++ b/src/test/compile-fail/map-types.rs
@@ -18,6 +18,6 @@
let x: Box<HashMap<int, int>> = box HashMap::new();
let x: Box<Map<int, int>> = x;
let y: Box<Map<uint, int>> = box x;
- //~^ ERROR failed to find an implementation of trait core::container::Map<uint,int>
- // for ~core::container::Map<int,int>:Send
+ //~^ ERROR failed to find an implementation of trait core::collections::Map<uint,int>
+ // for ~core::collections::Map<int,int>:Send
}
diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs
index 8659848..924625f 100644
--- a/src/test/run-pass/class-impl-very-parameterized-trait.rs
+++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs
@@ -48,7 +48,7 @@
}
}
-impl<T> Container for cat<T> {
+impl<T> Collection for cat<T> {
fn len(&self) -> uint { self.meows as uint }
fn is_empty(&self) -> bool { self.meows == 0 }
}
diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/run-pass/send_str_hashmap.rs
index 750235c..8b041ed 100644
--- a/src/test/run-pass/send_str_hashmap.rs
+++ b/src/test/run-pass/send_str_hashmap.rs
@@ -10,7 +10,7 @@
extern crate collections;
-use std::container::{Map, MutableMap};
+use std::collections::{Map, MutableMap};
use std::str::{SendStr, Owned, Slice};
use std::collections::HashMap;
use std::option::Some;
diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs
index 5604093..68eca8f 100644
--- a/src/test/run-pass/send_str_treemap.rs
+++ b/src/test/run-pass/send_str_treemap.rs
@@ -10,7 +10,7 @@
extern crate collections;
-use std::container::{ Map, MutableMap};
+use std::collections::{ Map, MutableMap};
use std::str::{SendStr, Owned, Slice};
use std::to_str::ToStr;
use self::collections::TreeMap;
