Skip to content

Commit

Permalink
Merge pull request 1124 from mleonhard/master
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed Apr 16, 2024
2 parents 2e15e3d + 25dc750 commit 051ce97
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/features_check/error.rs

This file was deleted.

13 changes: 0 additions & 13 deletions src/features_check/mod.rs

This file was deleted.

7 changes: 5 additions & 2 deletions src/lib.rs
Expand Up @@ -363,6 +363,11 @@
#![no_std]
#![cfg_attr(docsrs, feature(doc_cfg))]

#[cfg(not(any(feature = "std", feature = "alloc")))]
compile_error! {
"serde_json requires that either `std` (default) or `alloc` feature is enabled"
}

extern crate alloc;

#[cfg(feature = "std")]
Expand Down Expand Up @@ -409,8 +414,6 @@ pub mod ser;
mod ser;
pub mod value;

mod features_check;

mod io;
#[cfg(feature = "std")]
mod iter;
Expand Down

0 comments on commit 051ce97

Please sign in to comment.