From 10587f014c1ac0249cbeb005615369d579336eaa Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Sat, 1 Nov 2014 12:07:03 -0700 Subject: [PATCH] (fix) Remove upstream collection traits. As per https://github.com/rust-lang/rust/pull/18474 --- src/lib.rs | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 236db35..8c18102 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ #![license = "MIT"] -#![deny(missing_doc)] +#![deny(missing_docs)] #![deny(warnings)] //! A type-based key value store where one value type is allowed for each key. @@ -66,7 +66,7 @@ impl TypeMap { self.data.remove(&TypeId::of::()) } - /// Gets the given key's corresponding entry in the map for in-place manipulation. + /// Get the given key's corresponding entry in the map for in-place manipulation. pub fn entry<'a, K: Assoc, V: 'static>(&'a mut self) -> Entry<'a, K, V> { match self.data.entry(TypeId::of::()) { hashmap::Occupied(e) => Occupied(OccupiedEntry { data: e }), @@ -79,22 +79,37 @@ impl TypeMap { /// Get a mutable reference to the underlying HashMap pub unsafe fn data_mut(&mut self) -> &mut HashMap> { &mut self.data } + + /// Get the number of values stored in the map. + pub fn len(&self) -> uint { + self.data.len() + } + + /// Return true if the map contains no values. + pub fn is_empty(&self) -> bool { + self.data.is_empty() + } + + /// Remove all entries from the map. + pub fn clear(&mut self) { + self.data.clear() + } } -/// A view onto an entry in the map. +/// A view onto an entry in a TypeMap. pub enum Entry<'a, K, V> { - /// A view onto an occupied entry in the map. + /// A view onto an occupied entry in a TypeMap. Occupied(OccupiedEntry<'a, K, V>), - /// A view onto an unoccupied entry in the map. + /// A view onto an unoccupied entry in a TypeMap. Vacant(VacantEntry<'a, K, V>) } -/// A view onto an occupied entry in the map. +/// A view onto an occupied entry in a TypeMap. pub struct OccupiedEntry<'a, K, V> { data: hashmap::OccupiedEntry<'a, TypeId, Box> } -/// A view onto an unoccupied entry in the map. +/// A view onto an unoccupied entry in a TypeMap. pub struct VacantEntry<'a, K, V> { data: hashmap::VacantEntry<'a, TypeId, Box> } @@ -145,18 +160,6 @@ impl<'a, K, V: 'static> VacantEntry<'a, K, V> { } } -impl Collection for TypeMap { - fn len(&self) -> uint { - self.data.len() - } -} - -impl Mutable for TypeMap { - fn clear(&mut self) { - self.data.clear() - } -} - #[cfg(test)] mod test { use super::{TypeMap, Assoc, Occupied, Vacant}; @@ -192,14 +195,14 @@ mod test { assert_eq!(e.get(), &Value); assert_eq!(e.take(), Value); }, - _ => fail!("Unable to locate inserted item.") + _ => panic!("Unable to locate inserted item.") } assert!(!map.contains::()); match map.entry::() { Vacant(e) => { e.set(Value); }, - _ => fail!("Found non-existant entry.") + _ => panic!("Found non-existant entry.") } assert!(map.contains::()); }