fix(core): in-libstd build attempting to use std

Make sure core and not std is used when rustc-dep-of-std feature is enabled. May or may not fix #97
Frommi · Oct 4, 2020 · 5a5522d · 5a5522d
1 parent 8085909
commit 5a5522d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/miniz_oxide/build.rs b/miniz_oxide/build.rs
diff --git a/miniz_oxide/src/inflate/mod.rs b/miniz_oxide/src/inflate/mod.rs
@@ -1,10 +1,10 @@
 //! This module contains functionality for decompression.
 
-use ::core::cmp::min;
-use ::core::usize;
 use crate::alloc::boxed::Box;
 use crate::alloc::vec;
 use crate::alloc::vec::Vec;
+use ::core::cmp::min;
+use ::core::usize;
 
 pub mod core;
 mod output_buffer;

diff --git a/miniz_oxide/src/lib.rs b/miniz_oxide/src/lib.rs
@@ -23,11 +23,12 @@
 
 #![allow(warnings)]
 #![forbid(unsafe_code)]
-#![cfg_attr(has_alloc, no_std)]
+#![cfg_attr(any(has_alloc, feature = "rustc-dep-of-std"), no_std)]
 
-#[cfg(has_alloc)]
+// autocfg does not work when building in libstd, so manually enable this for that use case now.
+#[cfg(any(has_alloc, feature = "rustc-dep-of-std"))]
 extern crate alloc;
-#[cfg(not(has_alloc))]
+#[cfg(all(not(has_alloc), not(feature = "rustc-dep-of-std")))]
 use std as alloc;
 
 #[cfg(test)]