Skip to content

Commit

Permalink
Merge pull request #941 from serde-rs/alloc
Browse files Browse the repository at this point in the history
Delete 1.36+ caveat from descriptions of alloc feature
  • Loading branch information
dtolnay committed Oct 19, 2022
2 parents 486598b + ab0f884 commit c183125
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
Expand Up @@ -50,7 +50,6 @@ std = ["serde/std"]
# Provide integration for heap-allocated collections without depending on the
# rest of the Rust standard library.
# NOTE: Disabling both `std` *and* `alloc` features is not supported yet.
# Available on Rust 1.36+.
alloc = ["serde/alloc"]

# Make serde_json::Map use a representation which maintains insertion order.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -350,8 +350,8 @@ closed without a response after some time.
## No-std support

As long as there is a memory allocator, it is possible to use serde_json without
the rest of the Rust standard library. This is supported on Rust 1.36+. Disable
the default "std" feature and enable the "alloc" feature:
the rest of the Rust standard library. Disable the default "std" feature and
enable the "alloc" feature:

```toml
[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Expand Up @@ -279,8 +279,8 @@
//! # No-std support
//!
//! As long as there is a memory allocator, it is possible to use serde_json
//! without the rest of the Rust standard library. This is supported on Rust
//! 1.36+. Disable the default "std" feature and enable the "alloc" feature:
//! without the rest of the Rust standard library. Disable the default "std"
//! feature and enable the "alloc" feature:
//!
//! ```toml
//! [dependencies]
Expand Down

0 comments on commit c183125

Please sign in to comment.