Merge pull request #30 from blaenk/stack-overflow

(fix) deref box to avoid stack overflow

Author: reem

src/internals.rs

@@ -54,19 +54,19 @@ impl<T: Any + Clone> CloneAny for T {
 }
 
 impl Clone for Box<CloneAny> {
-    fn clone(&self) -> Box<CloneAny> { self.clone_any() }
+    fn clone(&self) -> Box<CloneAny> { (**self).clone_any() }
 }
 
 impl Clone for Box<CloneAny + Send> {
-    fn clone(&self) -> Box<CloneAny + Send> { self.clone_any_send() }
+    fn clone(&self) -> Box<CloneAny + Send> { (**self).clone_any_send() }
 }
 
 impl Clone for Box<CloneAny + Sync> {
-    fn clone(&self) -> Box<CloneAny + Sync> { self.clone_any_sync() }
+    fn clone(&self) -> Box<CloneAny + Sync> { (**self).clone_any_sync() }
 }
 
 impl Clone for Box<CloneAny + Send + Sync> {
-    fn clone(&self) -> Box<CloneAny + Send + Sync> { self.clone_any_send_sync() }
+    fn clone(&self) -> Box<CloneAny + Send + Sync> { (**self).clone_any_send_sync() }
 }
 
 unsafe impl UnsafeAnyExt for CloneAny {}

src/lib.rs

@@ -250,13 +250,13 @@ mod internals;
 
 #[cfg(test)]
 mod test {
-    use super::{TypeMap, SendMap, Key};
+    use super::{TypeMap, CloneMap, SendMap, Key};
     use super::Entry::{Occupied, Vacant};
 
     #[derive(Debug, PartialEq)]
     struct KeyType;
 
-    #[derive(Debug, PartialEq)]
+    #[derive(Clone, Debug, PartialEq)]
     struct Value(u8);
 
     impl Key for KeyType { type Value = Value; }
@@ -303,4 +303,12 @@ mod test {
         map.remove::<KeyType>();
         assert!(!map.contains::<KeyType>());
     }
+
+    #[test] fn test_clonemap() {
+        let mut map: CloneMap = TypeMap::custom();
+        map.insert::<KeyType>(Value(10));
+        assert!(map.contains::<KeyType>());
+        let cloned = map.clone();
+        assert_eq!(map.get::<KeyType>(), cloned.get::<KeyType>());
+    }
 }