Fix macro, harden by always using #![no_std], add test

Author: Ericson2314

src/lazy.rs

@@ -1,4 +1,7 @@
-use std::sync::Once;
+extern crate std;
+
+use self::std::prelude::v1::*;
+use self::std::sync::Once;
 
 pub struct Lazy<T: Sync>(pub *const T, pub Once);
 

src/lib.rs

@@ -69,7 +69,8 @@ The `Deref` implementation uses a hidden static variable that is guarded by a at
 */
 
 #![cfg_attr(feature="nightly", feature(const_fn, allow_internal_unstable, core_intrinsics))]
-#![cfg_attr(feature="no_std", no_std)]
+
+#![no_std]
 
 #[cfg(not(feature="nightly"))]
 pub mod lazy;
@@ -82,6 +83,8 @@ pub mod lazy;
 #[path="core_lazy.rs"]
 pub mod lazy;
 
+pub use core::ops::Deref as __Deref;
+
 #[macro_export]
 #[cfg_attr(feature="nightly", allow_internal_unstable)]
 macro_rules! lazy_static {
@@ -93,7 +96,7 @@ macro_rules! lazy_static {
     };
     (@$VIS:ident, $(#[$attr:meta])* static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
         lazy_static!(@MAKE TY, $VIS, $(#[$attr])*, $N);
-        impl ::std::ops::Deref for $N {
+        impl $crate::__Deref for $N {
             type Target = $T;
             #[allow(unsafe_code)]
             fn deref<'a>(&'a self) -> &'a $T {

src/nightly_lazy.rs

@@ -1,7 +1,8 @@
-use std::sync::Once;
+extern crate std;
 
-use std::cell::UnsafeCell;
-use std::sync::ONCE_INIT;
+use self::std::prelude::v1::*;
+use self::std::cell::UnsafeCell;
+use self::std::sync::{Once, ONCE_INIT};
 
 pub struct Lazy<T: Sync>(UnsafeCell<Option<T>>, Once);
 
@@ -22,7 +23,7 @@ impl<T: Sync> Lazy<T> {
 
             match *self.0.get() {
                 Some(ref x) => x,
-                None => ::std::intrinsics::unreachable(),
+                None => std::intrinsics::unreachable(),
             }
         }
     }

tests/no_std.rs

@@ -0,0 +1,21 @@
+#![cfg(feature="no_std")]
+#![feature(const_fn, core_intrinsics)]
+
+#![no_std]
+
+#[macro_use]
+extern crate lazy_static;
+
+lazy_static! {
+    /// Documentation!
+    pub static ref NUMBER: u32 = times_two(3);
+}
+
+fn times_two(n: u32) -> u32 {
+    n * 2
+}
+
+#[test]
+fn test_basic() {
+    assert_eq!(*NUMBER, 6);
+}