Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

include:
# Test MSRV
- rust: 1.70.0 # keep in sync with manifest rust-version
- rust: 1.87.0 # keep in sync with manifest rust-version
TARGET: x86_64-unknown-linux-gnu

# Test nightly but don't fail
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]

### Breaking
- MSRV is now `1.70.0`.
- MSRV is now `1.87.0`.

## [v0.6.0] - 2024-08-07

Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ categories = ["parsing", "no-std", "no-std::no-alloc", "embedded", "web-programm
description = "serde-json for no_std programs"
documentation = "https://docs.rs/serde-json-core"
edition = "2018"
rust-version = "1.70.0" # keep in sync with ci, src/lib.rs, and README
rust-version = "1.87.0" # keep in sync with ci, src/lib.rs, and README
keywords = ["serde", "json"]
license = "MIT OR Apache-2.0"
name = "serde-json-core"
Expand All @@ -20,7 +20,7 @@ version = "0.6.0"
ryu = "1.0.5"

[dependencies.heapless]
version = "0.8"
version = "0.9.1"
features = ["serde"]
optional = true

Expand All @@ -30,7 +30,7 @@ features = ["derive"]
version = "1.0.100"

[dependencies.defmt]
version = "0.3"
version = "1.0.1"
optional = true

[dev-dependencies]
Expand All @@ -40,4 +40,4 @@ serde_derive = "1.0.100"
default = ["heapless"]
custom-error-messages = ["heapless"]
std = ["serde/std"]
defmt = ["dep:defmt", "heapless?/defmt-03"]
defmt = ["dep:defmt", "heapless?/defmt"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This project is developed and maintained by the [rust-embedded-community].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.70.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.87.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
7 changes: 7 additions & 0 deletions src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ impl From<u8> for Error {
}
}

#[cfg(feature = "heapless")]
impl From<heapless::CapacityError> for Error {
fn from(_: heapless::CapacityError) -> Self {
Error::BufferFull
}
}

impl serde::ser::StdError for Error {}

impl fmt::Display for Error {
Expand Down