Added support for public lazy statics

Updated travis config

Author: Kimundi

.gitignore

@@ -1,2 +1,3 @@
 target
 doc
+Cargo.lock

.travis.yml

@@ -1,15 +1,11 @@
+language: rust
 env:
   global:
     - secure: M9/ZDZMaLRBlM5uzmbQQEClBzy7aoaiSz6UVjepXsH9Q1+9bIO8WVAS8Pi2ywkSv+W7EUCkQNKx+zNt9jIkNb366dQxf8/cbhQPnJ9xpleo5CkA3Iul1aXGMusQU9IDDtaTuj0k0FUhiLxPaq/T4uogQ/QZGUypmKM8oRe13N1A=
-before_install:
-  - yes | sudo add-apt-repository ppa:hansjorg/rust
-  - yes | sudo add-apt-repository ppa:cmrx64/cargo
-  - sudo apt-get update
-install:
-  - sudo apt-get install rust-nightly cargo
 script:
-  - cargo build
-  - cargo test
-  - rustdoc src/lazy_static.rs
+  - cargo build --verbose
+  - cargo test --verbose
+  - cargo doc
+  - cp -r ./target/doc ./doc
 after_script:
   - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh

Cargo.toml

@@ -4,6 +4,6 @@ name = "lazy_static"
 version = "0.1.0"
 authors = [ "[email protected]" ]
 
-[[lib]]
+[lib]
 
 name = "lazy_static"

README.md

@@ -14,10 +14,10 @@ as well as anything that requires function calls to be computed.
 
 ```rust
 lazy_static! {
-    static ref NAME_1: TYPE_1 = EXPR_1;
-    static ref NAME_2: TYPE_2 = EXPR_2;
+    [pub] static ref NAME_1: TYPE_1 = EXPR_1;
+    [pub] static ref NAME_2: TYPE_2 = EXPR_2;
     ...
-    static ref NAME_N: TYPE_N = EXPR_N;
+    [pub] static ref NAME_N: TYPE_N = EXPR_N;
 }
 ```
 

src/lazy_static.rs

@@ -8,12 +8,12 @@ as well as anything that requires function calls to be computed.
 
 # Syntax
 
-```rust
+```ignore
 lazy_static! {
-    static ref NAME_1: TYPE_1 = EXPR_1;
-    static ref NAME_2: TYPE_2 = EXPR_2;
+    [pub] static ref NAME_1: TYPE_1 = EXPR_1;
+    [pub] static ref NAME_2: TYPE_2 = EXPR_2;
     ...
-    static ref NAME_N: TYPE_N = EXPR_N;
+    [pub] static ref NAME_N: TYPE_N = EXPR_N;
 }
 ```
 
@@ -77,32 +77,47 @@ define uninitialized `static mut` values.
 
 #[macro_export]
 macro_rules! lazy_static {
-    ($(static ref $N:ident : $T:ty = $e:expr;)*) => {
-        $(
-            #[allow(non_camel_case_types)]
-            #[allow(dead_code)]
-            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};
-                    use std::mem::transmute;
-
-                    #[inline(always)]
-                    fn require_sync<T: Sync>(_: &T) { }
-
-                    unsafe {
-                        static mut s: *const $T = 0 as *const $T;
-                        static mut ONCE: Once = ONCE_INIT;
-                        ONCE.doit(|| {
-                            s = transmute::<Box<$T>, *const $T>(box() ($e));
-                        });
-                        let static_ref = &*s;
-                        require_sync(static_ref);
-                        static_ref
-                    }
+    (static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        lazy_static!(PRIV static ref $N : $T = $e; $($t)*)
+    };
+    (pub static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        lazy_static!(PUB static ref $N : $T = $e; $($t)*)
+    };
+    ($VIS:ident static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        lazy_static!(MAKE TY $VIS $N)
+        impl Deref<$T> for $N {
+            fn deref<'a>(&'a self) -> &'a $T {
+                use std::sync::{Once, ONCE_INIT};
+                use std::mem::transmute;
+
+                #[inline(always)]
+                fn require_sync<T: Sync>(_: &T) { }
+
+                unsafe {
+                    static mut s: *const $T = 0 as *const $T;
+                    static mut ONCE: Once = ONCE_INIT;
+                    ONCE.doit(|| {
+                        s = transmute::<Box<$T>, *const $T>(box() ($e));
+                    });
+                    let static_ref = &*s;
+                    require_sync(static_ref);
+                    static_ref
                 }
             }
-        )*
-    }
+        }
+        lazy_static!($($t)*)
+    };
+    (MAKE TY PUB $N:ident) => {
+        #[allow(non_camel_case_types)]
+        #[allow(dead_code)]
+        pub struct $N {__private_field: ()}
+        pub static $N: $N = $N {__private_field: ()};
+    };
+    (MAKE TY PRIV $N:ident) => {
+        #[allow(non_camel_case_types)]
+        #[allow(dead_code)]
+        struct $N {__private_field: ()}
+        static $N: $N = $N {__private_field: ()};
+    };
+    () => ()
 }

tests/test.rs

@@ -28,7 +28,7 @@ fn test_basic() {
     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]);
+    assert_eq!(ARRAY_BOXES.as_slice(), [box 1, box 2, box 3].as_slice());
 }
 
 #[test]
@@ -37,3 +37,14 @@ fn test_repeat() {
     assert_eq!(*NUMBER, 6);
     assert_eq!(*NUMBER, 6);
 }
+
+mod visibility {
+    lazy_static! {
+        pub static ref FOO: Box<uint> = box 0u;
+    }
+}
+
+#[test]
+fn test_visibility() {
+    assert_eq!(*visibility::FOO, box 0u);
+}