Skip to content

Commit 051ce97

Browse files
committed
Merge pull request 1124 from mleonhard/master
2 parents 2e15e3d + 25dc750 commit 051ce97

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

src/features_check/error.rs

-1
This file was deleted.

src/features_check/mod.rs

-13
This file was deleted.

src/lib.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,11 @@
363363
#![no_std]
364364
#![cfg_attr(docsrs, feature(doc_cfg))]
365365

366+
#[cfg(not(any(feature = "std", feature = "alloc")))]
367+
compile_error! {
368+
"serde_json requires that either `std` (default) or `alloc` feature is enabled"
369+
}
370+
366371
extern crate alloc;
367372

368373
#[cfg(feature = "std")]
@@ -409,8 +414,6 @@ pub mod ser;
409414
mod ser;
410415
pub mod value;
411416

412-
mod features_check;
413-
414417
mod io;
415418
#[cfg(feature = "std")]
416419
mod iter;

0 commit comments

Comments
 (0)