Merge branch 'master' into defmt-escaped-str

Author: eldruin

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
 
         include:
           # Test MSRV
-          - rust: 1.65.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

CHANGELOG.md

@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-### Added
 
+### Breaking
+- MSRV is now `1.87.0`.
+
+### Added
 - Implement `defmt::Format` for `EscapedStr`, `EscapedStringFragment` and `StringUnescapeError`.
 - Implement `Default` for `EscapedStr` (returning an empty string).
 
+### Changed
+- Updated `heapless` to version 0.9.2.
+- Updated `defmt` to version 1.0.1.
+
 ## [v0.6.0] - 2024-08-07
 
 ### Breaking

Cargo.toml

@@ -4,11 +4,11 @@ authors = ["Jorge Aparicio <[email protected]>",
            "Robert Jördens <[email protected]>",
            "Mathias Koch <[email protected]>"
 ]
-categories = ["no-std"]
+categories = ["parsing", "no-std", "no-std::no-alloc", "embedded", "web-programming"]
 description = "serde-json for no_std programs"
 documentation = "https://docs.rs/serde-json-core"
 edition = "2018"
-rust-version = "1.65.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"
@@ -20,7 +20,7 @@ version = "0.6.0"
 ryu = "1.0.5"
 
 [dependencies.heapless]
-version = "0.8"
+version = "0.9.2"
 features = ["serde"]
 optional = true
 
@@ -30,7 +30,7 @@ features = ["derive"]
 version = "1.0.100"
 
 [dependencies.defmt]
-version = "0.3"
+version = "1.0.1"
 optional = true
 
 [dev-dependencies]
@@ -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"]

README.md

@@ -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.65.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

src/lib.rs

@@ -47,15 +47,13 @@
 //!   - `bool`
 //!   - Integers
 //!   - Floats
-//!   - `str` (\*\*)
+//!   - `str`
 //!   - `Option`
 //!   - Arrays
 //!   - Tuples
 //!   - Structs
 //!   - C like enums
 //!
-//! (\*\*) Serialization of strings doesn't escape stuff. This simply has not been implemented yet.
-//!
 //! # Planned features
 //!
 //! - (De)serialization from / into IO objects once `core::io::{Read,Write}` becomes a thing.
@@ -70,7 +68,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.65.0 and up. It *might* compile with older
+//! This crate is guaranteed to compile on stable Rust 1.70.0 and up. It *might* compile with older
 //! versions but that may change in any new patch release.
 
 #![deny(missing_docs)]

src/ser/mod.rs

@@ -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 {