New upstream version 1.48.0~beta.8+dfsg1

[rustc.git] / vendor / miniz_oxide / src / lib.rs

diff --git a/vendor/miniz_oxide/src/lib.rs b/vendor/miniz_oxide/src/lib.rs
index 4ae3d76c72b864f343b28e8f9ce8c652582769f9..0b4c60787d547d4637ee1fe1810bd48bfbce9275 100644 (file)
--- a/vendor/miniz_oxide/src/lib.rs
+++ b/vendor/miniz_oxide/src/lib.rs
@@ -23,9 +23,12 @@
 
 #![allow(warnings)]
 #![forbid(unsafe_code)]
-#![no_std]
+#![cfg_attr(not(feature = "no_extern_crate_alloc"), no_std)]
 
+#[cfg(not(feature = "no_extern_crate_alloc"))]
 extern crate alloc;
+#[cfg(feature = "no_extern_crate_alloc")]
+use std as alloc;
 
 #[cfg(test)]
 extern crate std;