Enabled Cargo and moved Makefile to use target.

[anymap] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 1202332a284afbbd9a221c8ee7ea12277888231c..b67731966952329e32591fc45b1dee86797440f1 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,14 +6,14 @@
  #![feature(default_type_params)]
  #![warn(unnecessary_qualification, non_uppercase_statics,
          variant_size_difference, managed_heap_memory, unnecessary_typecast,
  #![feature(default_type_params)]
  #![warn(unnecessary_qualification, non_uppercase_statics,
          variant_size_difference, managed_heap_memory, unnecessary_typecast,
-        missing_doc, unused_result, deprecated_owned_vector)]
+        missing_doc, unused_result)]
  
  #[cfg(test)]
  extern crate test;
  
  use std::any::Any;
  use std::intrinsics::TypeId;
  
  #[cfg(test)]
  extern crate test;
  
  use std::any::Any;
  use std::intrinsics::TypeId;
-use std::collections::HashMap;
+use std::collections::{Collection, HashMap, Mutable};
  use std::hash::{Hash, Hasher, Writer};
  use std::mem::{transmute, transmute_copy};
  use std::raw::TraitObject;
  use std::hash::{Hash, Hasher, Writer};
  use std::mem::{transmute, transmute_copy};
  use std::raw::TraitObject;
@@ -109,7 +109,7 @@ impl<'a> UncheckedAnyMutRefExt<'a> for &'a mut Any {
  ///
  /// Values containing non-static references are not permitted.
  pub struct AnyMap {
  ///
  /// Values containing non-static references are not permitted.
  pub struct AnyMap {
-    data: HashMap<TypeId, Box<Any>:'static, TypeIdHasher>,
+    data: HashMap<TypeId, Box<Any>, TypeIdHasher>,
  }
  
  impl AnyMap {
  }
  
  impl AnyMap {
@@ -144,6 +144,22 @@ impl AnyMap {
      }
  }
  
      }
  }
  
+impl Collection for AnyMap {
+    fn len(&self) -> uint {
+        self.data.len()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.data.is_empty()
+    }
+}
+
+impl Mutable for AnyMap {
+    fn clear(&mut self) {
+        self.data.clear();
+    }
+}
+
  #[bench]
  fn bench_insertion(b: &mut ::test::Bencher) {
      b.iter(|| {
  #[bench]
  fn bench_insertion(b: &mut ::test::Bencher) {
      b.iter(|| {