Merge pull request #132 from KodrAus/feat/remove-heap-impl

Remove the heap impl now that inline is always available

Author: KodrAus

.travis.yml

@@ -12,10 +12,6 @@ matrix:
       script:
         - cargo test
         - cargo bench
-        - cargo test --features nightly
-        - cargo bench --features nightly
-        - CARGO_CFG_LAZY_STATIC_HEAP_IMPL=1 cargo test
-        - CARGO_CFG_LAZY_STATIC_HEAP_IMPL=1 cargo bench
         - cargo test --features spin_no_std
         - cargo bench --features spin_no_std
         - cd compiletest

Cargo.toml

@@ -14,17 +14,12 @@ keywords = ["macro", "lazy", "static"]
 categories = [ "no-std", "rust-patterns", "memory-management" ]
 exclude = ["/.travis.yml", "/appveyor.yml"]
 
-build = "build.rs"
-
 [dependencies.spin]
 version = "0.4.10"
 optional = true
 default-features = false
 features = ["once"]
 
-[build-dependencies]
-version_check = "0.1.4"
-
 [features]
 nightly = []
 spin_no_std = ["spin"]

build.rs

@@ -6,8 +6,6 @@ under a different crate name so that can be imported in the compile tests.
 This currently appears to use the right local build of `lazy_static`.
 */
 
-#![feature(use_extern_macros)]
-
 extern crate lazy_static;
 
 pub use self::lazy_static::*;

compiletest/src/lib.rs

@@ -103,17 +103,12 @@ no guarantees can be made about them in regard to SemVer stability.
 #![doc(html_root_url = "https://docs.rs/lazy_static/1.1.0")]
 #![no_std]
 
-#[cfg(lazy_static_heap_impl)]
-#[path="heap_lazy.rs"]
-#[doc(hidden)]
-pub mod lazy;
-
-#[cfg(lazy_static_inline_impl)]
+#[cfg(not(feature = "spin_no_std"))]
 #[path="inline_lazy.rs"]
 #[doc(hidden)]
 pub mod lazy;
 
-#[cfg(lazy_static_spin_impl)]
+#[cfg(feature = "spin_no_std")]
 #[path="core_lazy.rs"]
 #[doc(hidden)]
 pub mod lazy;