diff --git a/Cargo.lock b/Cargo.lock index 59be1f1..af07e86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "merde" -version = "5.1.1" +version = "6.0.0" dependencies = [ "merde_core", "merde_json", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "merde_core" -version = "5.1.0" +version = "6.0.0" dependencies = [ "compact_str", "rubicon", @@ -185,7 +185,7 @@ dependencies = [ [[package]] name = "merde_json" -version = "5.1.0" +version = "6.0.0" dependencies = [ "lexical-parse-float", "merde_core", @@ -195,7 +195,7 @@ dependencies = [ [[package]] name = "merde_time" -version = "4.0.10" +version = "4.0.11" dependencies = [ "merde_core", "merde_json", diff --git a/README.md b/README.md index c8eb6e5..048982a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![license: MIT/Apache-2.0](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](LICENSE-MIT) -[![crates.io](https://img.shields.io/crates/v/merde_json.svg)](https://crates.io/crates/merde_json) -[![docs.rs](https://docs.rs/merde_json/badge.svg)](https://docs.rs/merde_json) +[![crates.io](https://img.shields.io/crates/v/merde.svg)](https://crates.io/crates/merde) +[![docs.rs](https://docs.rs/merde/badge.svg)](https://docs.rs/merde) # merde @@ -20,6 +20,7 @@ Then head over to the crate documentations: * [merde](./merde/README.md) * [merde_json](./merde_json/README.md) + * [merde_yaml](./merde_yaml/README.md) ## FAQ diff --git a/merde/CHANGELOG.md b/merde/CHANGELOG.md index 5dc9b2b..3546630 100644 --- a/merde/CHANGELOG.md +++ b/merde/CHANGELOG.md @@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.0](https://github.com/bearcove/merde/compare/merde-v5.1.1...merde-v6.0.0) - 2024-09-22 + +### Added + +- [**breaking**] Include key name in error ([#73](https://github.com/bearcove/merde/pull/73)) + +### Other + +- Initial merde_yaml addition ([#77](https://github.com/bearcove/merde/pull/77)) +- Remove ValueDeserialize macros +- Make option optional +- Port more things to deserialize +- Steal @compiler-errors's suggestion (thanks Michael!) +- port one more example +- impl_deserialize is a noop unless the feature is enabled +- Convert example +- Move mixed example to deserialize +- Move more examples over to Deserialize +- Move away from ValueDeserialize +- Fix all tests +- add lifetimes to errors aw yiss + ## [5.1.1](https://github.com/bearcove/merde/compare/merde-v5.1.0...merde-v5.1.1) - 2024-09-20 ### Other diff --git a/merde/Cargo.toml b/merde/Cargo.toml index 0007712..f49eecb 100644 --- a/merde/Cargo.toml +++ b/merde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "merde" -version = "5.1.1" +version = "6.0.0" edition = "2021" authors = ["Amos Wenger "] description = "Serialize and deserialize with declarative macros" @@ -41,10 +41,10 @@ path = "examples/yaml.rs" required-features = ["yaml"] [dependencies] -merde_core = { version = "5.1.0", path = "../merde_core", optional = true } -merde_json = { version = "5.1.0", path = "../merde_json", optional = true } +merde_core = { version = "6.0.0", path = "../merde_core", optional = true } +merde_json = { version = "6.0.0", path = "../merde_json", optional = true } merde_yaml = { version = "5.1.0", path = "../merde_yaml", optional = true } -merde_time = { version = "4.0.10", path = "../merde_time", optional = true, features = [ +merde_time = { version = "4.0.11", path = "../merde_time", optional = true, features = [ "merde", "deserialize", ] } diff --git a/merde_core/CHANGELOG.md b/merde_core/CHANGELOG.md index 0abc07d..0b239fc 100644 --- a/merde_core/CHANGELOG.md +++ b/merde_core/CHANGELOG.md @@ -6,6 +6,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.0](https://github.com/bearcove/merde/compare/merde_core-v5.1.0...merde_core-v6.0.0) - 2024-09-22 + +### Added + +- [**breaking**] Include key name in error ([#73](https://github.com/bearcove/merde/pull/73)) + +### Other + +- Add bytes type ([#76](https://github.com/bearcove/merde/pull/76)) +- Remove ValueDeserialize macros +- Remove definition of ValueDeserialize +- Make option optional +- Convert example +- Move mixed example to deserialize +- Move away from ValueDeserialize +- Use UnexpectedEvent +- Deserializable => Deserialize, a-la serde +- Fix all tests +- Well that works +- okay hang on +- Play around with API +- mhmh +- poll failed you say +- add lifetimes to errors aw yiss +- des2 ideas + ## [5.1.0](https://github.com/bearcove/merde/compare/merde_core-v5.0.5...merde_core-v5.1.0) - 2024-09-20 ### Added diff --git a/merde_core/Cargo.toml b/merde_core/Cargo.toml index 50d3bcd..c7c6568 100644 --- a/merde_core/Cargo.toml +++ b/merde_core/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "merde_core" -version = "5.1.0" +version = "6.0.0" authors = ["Amos Wenger "] description = "Base types for merde" license = "Apache-2.0 OR MIT" diff --git a/merde_json/CHANGELOG.md b/merde_json/CHANGELOG.md index 94a9d51..a623496 100644 --- a/merde_json/CHANGELOG.md +++ b/merde_json/CHANGELOG.md @@ -6,6 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.0](https://github.com/bearcove/merde/compare/merde_json-v5.1.0...merde_json-v6.0.0) - 2024-09-22 + +### Other + +- Add bytes type ([#76](https://github.com/bearcove/merde/pull/76)) +- Remove ValueDeserialize macros +- Remove definition of ValueDeserialize +- Convert example +- Move away from ValueDeserialize +- Use UnexpectedEvent +- Deserializable => Deserialize, a-la serde +- Fix all tests +- Well that works +- okay hang on +- get rid of queue in JsonSerializer +- Play around with API +- mhmh +- Well the new deserializer seems to be working +- poll failed you say +- add lifetimes to errors aw yiss + ## [5.1.0](https://github.com/bearcove/merde/compare/merde_json-v5.0.5...merde_json-v5.1.0) - 2024-09-20 ### Added diff --git a/merde_json/Cargo.toml b/merde_json/Cargo.toml index 21cb887..a7de533 100644 --- a/merde_json/Cargo.toml +++ b/merde_json/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "merde_json" -version = "5.1.0" +version = "6.0.0" edition = "2021" authors = ["Amos Wenger "] description = "JSON serialization and deserialization for merde, via jiter" @@ -12,7 +12,7 @@ categories = ["encoding", "parser-implementations"] [dependencies] lexical-parse-float = { version = "0.8.5", features = ["format"] } -merde_core = { version = "5.1.0", path = "../merde_core" } +merde_core = { version = "6.0.0", path = "../merde_core" } num-bigint = { version = "0.4.6", optional = true } num-traits = { version = "0.2.19", optional = true } diff --git a/merde_time/CHANGELOG.md b/merde_time/CHANGELOG.md index d2455ae..0ab782b 100644 --- a/merde_time/CHANGELOG.md +++ b/merde_time/CHANGELOG.md @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.0.11](https://github.com/bearcove/merde/compare/merde_time-v4.0.10...merde_time-v4.0.11) - 2024-09-22 + +### Other + +- Remove ValueDeserialize macros +- Port more things to deserialize +- Fix all tests +- add lifetimes to errors aw yiss + ## [4.0.10](https://github.com/bearcove/merde/compare/merde_time-v4.0.9...merde_time-v4.0.10) - 2024-09-20 ### Other diff --git a/merde_time/Cargo.toml b/merde_time/Cargo.toml index 092c022..7f6ea2a 100644 --- a/merde_time/Cargo.toml +++ b/merde_time/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "merde_time" -version = "4.0.10" +version = "4.0.11" authors = ["Amos Wenger "] description = "Wrapper date-time types for merde" license = "Apache-2.0 OR MIT" @@ -11,8 +11,8 @@ keywords = ["merde", "serialization", "deserialization"] categories = ["encoding", "parser-implementations"] [dependencies] -merde_core = { version = "5.1.0", path = "../merde_core", optional = true } -merde_json = { version = "5.1.0", path = "../merde_json", optional = true } +merde_core = { version = "6.0.0", path = "../merde_core", optional = true } +merde_json = { version = "6.0.0", path = "../merde_json", optional = true } time = "0.3.36" [dev-dependencies] diff --git a/merde_yaml/Cargo.toml b/merde_yaml/Cargo.toml index abc9f3e..05c905d 100644 --- a/merde_yaml/Cargo.toml +++ b/merde_yaml/Cargo.toml @@ -9,8 +9,7 @@ readme = "README.md" repository = "https://github.com/bearcove/merde" keywords = ["yaml", "serialization", "deserialization"] categories = ["encoding", "parser-implementations"] -publish = false [dependencies] -merde_core = { version = "5.1.0", path = "../merde_core" } +merde_core = { version = "6.0.0", path = "../merde_core" } yaml-rust2 = { version = "0.8.1", default-features = false }