Fix warning; Made test external

Author: Kimundi

.gitignore

@@ -0,0 +1,2 @@
+target
+doc

src/lazy_static.rs

@@ -70,7 +70,6 @@ define uninitialized `static mut` values.
 
 */
 
-#![crate_id = "lazy_static"]
 #![crate_type = "dylib"]
 #![license = "MIT"]
 
@@ -82,8 +81,8 @@ macro_rules! lazy_static {
         $(
             #[allow(non_camel_case_types)]
             #[allow(dead_code)]
-            struct $N {__unit__: ()}
-            static $N: $N = $N {__unit__: ()};
+            struct $N {__private_field: ()}
+            static $N: $N = $N {__private_field: ()};
             impl Deref<$T> for $N {
                 fn deref<'a>(&'a self) -> &'a $T {
                     use std::sync::{Once, ONCE_INIT};
@@ -104,46 +103,6 @@ macro_rules! lazy_static {
                     }
                 }
             }
-
         )*
     }
 }
-
-#[cfg(test)]
-mod test {
-    use std::collections::HashMap;
-
-    lazy_static! {
-        static ref NUMBER: uint = times_two(3);
-        static ref VEC: [Box<uint>, ..3] = [box 1, box 2, box 3];
-        static ref OWNED_STRING: String = "hello".to_string();
-        static ref HASHMAP: HashMap<uint, &'static str> = {
-            let mut m = HashMap::new();
-            m.insert(0u, "abc");
-            m.insert(1, "def");
-            m.insert(2, "ghi");
-            m
-        };
-        static ref UNUSED: () = ();
-    }
-
-    fn times_two(n: uint) -> uint {
-        n * 2
-    }
-
-    #[test]
-    fn test_basic() {
-        assert_eq!(OWNED_STRING.as_slice(), "hello");
-        assert_eq!(*NUMBER, 6);
-        assert!(HASHMAP.find(&1).is_some());
-        assert!(HASHMAP.find(&3).is_none());
-        assert_eq!(VEC.as_slice(), &[box 1, box 2, box 3]);
-    }
-
-    #[test]
-    fn test_repeat() {
-        assert_eq!(*NUMBER, 6);
-        assert_eq!(*NUMBER, 6);
-        assert_eq!(*NUMBER, 6);
-    }
-}

tests/test.rs

@@ -0,0 +1,39 @@
+#![feature(phase)]
+
+#[phase(plugin)]
+extern crate lazy_static;
+use std::collections::HashMap;
+
+lazy_static! {
+    static ref NUMBER: uint = times_two(3);
+    static ref ARRAY_BOXES: [Box<uint>, ..3] = [box 1, box 2, box 3];
+    static ref STRING: String = "hello".to_string();
+    static ref HASHMAP: HashMap<uint, &'static str> = {
+        let mut m = HashMap::new();
+        m.insert(0u, "abc");
+        m.insert(1, "def");
+        m.insert(2, "ghi");
+        m
+    };
+    static ref UNUSED: () = ();
+}
+
+fn times_two(n: uint) -> uint {
+    n * 2
+}
+
+#[test]
+fn test_basic() {
+    assert_eq!(STRING.as_slice(), "hello");
+    assert_eq!(*NUMBER, 6);
+    assert!(HASHMAP.find(&1).is_some());
+    assert!(HASHMAP.find(&3).is_none());
+    assert_eq!(ARRAY_BOXES.as_slice(), &[box 1, box 2, box 3]);
+}
+
+#[test]
+fn test_repeat() {
+    assert_eq!(*NUMBER, 6);
+    assert_eq!(*NUMBER, 6);
+    assert_eq!(*NUMBER, 6);
+}