From 5a653926d6ccccb6149b34abb464e36aae51399d Mon Sep 17 00:00:00 2001 From: Jonas Bushart Date: Sat, 19 Aug 2023 11:46:12 +0200 Subject: [PATCH] Bump version to v3.3.0 for `hashbrown` support --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 14 +++++++------- serde_with/CHANGELOG.md | 24 ++++++++++++++++++++++++ serde_with/Cargo.toml | 2 +- serde_with/src/lib.rs | 26 +++++++++++++------------- serde_with_macros/CHANGELOG.md | 4 ++++ serde_with_macros/src/lib.rs | 10 +++++----- 8 files changed, 57 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77470651..7f3e54d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -617,7 +617,7 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" dependencies = [ "base64 0.21.0", "chrono", @@ -649,7 +649,7 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" dependencies = [ "darling", "expect-test", diff --git a/Cargo.toml b/Cargo.toml index 41caafd0..386b5aaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/jonasbb/serde_with/" rust-version = "1.64" -version = "3.2.0" +version = "3.3.0" [workspace.metadata.release] consolidate-commits = true diff --git a/README.md b/README.md index f531530f..da8711a6 100644 --- a/README.md +++ b/README.md @@ -183,14 +183,14 @@ Foo::Bytes { } ``` -[`DisplayFromStr`]: https://docs.rs/serde_with/3.2.0/serde_with/struct.DisplayFromStr.html -[`with_prefix!`]: https://docs.rs/serde_with/3.2.0/serde_with/macro.with_prefix.html -[feature flags]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html -[skip_serializing_none]: https://docs.rs/serde_with/3.2.0/serde_with/attr.skip_serializing_none.html -[StringWithSeparator]: https://docs.rs/serde_with/3.2.0/serde_with/struct.StringWithSeparator.html -[user guide]: https://docs.rs/serde_with/3.2.0/serde_with/guide/index.html +[`DisplayFromStr`]: https://docs.rs/serde_with/3.3.0/serde_with/struct.DisplayFromStr.html +[`with_prefix!`]: https://docs.rs/serde_with/3.3.0/serde_with/macro.with_prefix.html +[feature flags]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html +[skip_serializing_none]: https://docs.rs/serde_with/3.3.0/serde_with/attr.skip_serializing_none.html +[StringWithSeparator]: https://docs.rs/serde_with/3.3.0/serde_with/struct.StringWithSeparator.html +[user guide]: https://docs.rs/serde_with/3.3.0/serde_with/guide/index.html [with-annotation]: https://serde.rs/field-attrs.html#with -[as-annotation]: https://docs.rs/serde_with/3.2.0/serde_with/guide/serde_as/index.html +[as-annotation]: https://docs.rs/serde_with/3.3.0/serde_with/guide/serde_as/index.html ## License diff --git a/serde_with/CHANGELOG.md b/serde_with/CHANGELOG.md index a48f469f..2d3bce0e 100644 --- a/serde_with/CHANGELOG.md +++ b/serde_with/CHANGELOG.md @@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [3.3.0] - 2023-08-19 + +### Added + +* Support the `hashbrown` type `HashMap` and `HashSet` (#636, #637) + Thanks to @OliverNChalk for raising the issue and submitting a PR. + + This extends the existing support for `HashMap`s and `HashSet`s to the `hashbrown` crate v0.14. + The same conversions as for the `std` and `indexmap` types are available, like general support for `#[serde_as]` and converting it to/from sequences or maps. + +### Changed + +* Generalize some trait bounds for `DeserializeAs` implementations + + While working on #637 it came to light that some of the macros for generating `DeserializeAs` implementations were not as generic as they could. + This means they didn't work with custom hasher types, but only the default hashers. + This has now been fixed and custom hashers should work better, as long as they implement `BuildHasher + Default`. + +* (internal) Change how features are documented (#639) + + This change moves the feature documentation into `Cargo.toml` in a format that can be read by lib.rs. + It will improve the generated features documentation there. + The page with all features remains in the guide but is now generated from the `Cargo.toml` information. + ## [3.2.0] - 2023-08-04 ### Added diff --git a/serde_with/Cargo.toml b/serde_with/Cargo.toml index 6ec23cdb..260b47b6 100644 --- a/serde_with/Cargo.toml +++ b/serde_with/Cargo.toml @@ -124,7 +124,7 @@ indexmap_2 = {package = "indexmap", version = "2.0", optional = true, default-fe # https://github.com/jonasbb/serde_with/blob/eb1965a74a3be073ecd13ec05f02a01bc1c44309/serde_with/src/flatten_maybe.rs#L67 serde = {version = "1.0.157", default-features = false, features = ["derive"] } serde_json = {version = "1.0.45", optional = true, default-features = false} -serde_with_macros = {path = "../serde_with_macros", version = "=3.2.0", optional = true} +serde_with_macros = {path = "../serde_with_macros", version = "=3.3.0", optional = true} time_0_3 = {package = "time", version = "~0.3.11", optional = true, default-features = false} [dev-dependencies] diff --git a/serde_with/src/lib.rs b/serde_with/src/lib.rs index 8b8c2643..dd1b2718 100644 --- a/serde_with/src/lib.rs +++ b/serde_with/src/lib.rs @@ -26,7 +26,7 @@ #![doc(test(attr(warn(rust_2018_idioms))))] // Not needed for 2018 edition and conflicts with `rust_2018_idioms` #![doc(test(no_crate_inject))] -#![doc(html_root_url = "https://docs.rs/serde_with/3.2.0/")] +#![doc(html_root_url = "https://docs.rs/serde_with/3.3.0/")] #![cfg_attr(docsrs, feature(doc_cfg))] #![allow( // clippy is broken and shows wrong warnings @@ -281,14 +281,14 @@ //! # } //! ``` //! -//! [`DisplayFromStr`]: https://docs.rs/serde_with/3.2.0/serde_with/struct.DisplayFromStr.html -//! [`with_prefix!`]: https://docs.rs/serde_with/3.2.0/serde_with/macro.with_prefix.html -//! [feature flags]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html -//! [skip_serializing_none]: https://docs.rs/serde_with/3.2.0/serde_with/attr.skip_serializing_none.html -//! [StringWithSeparator]: https://docs.rs/serde_with/3.2.0/serde_with/struct.StringWithSeparator.html -//! [user guide]: https://docs.rs/serde_with/3.2.0/serde_with/guide/index.html +//! [`DisplayFromStr`]: https://docs.rs/serde_with/3.3.0/serde_with/struct.DisplayFromStr.html +//! [`with_prefix!`]: https://docs.rs/serde_with/3.3.0/serde_with/macro.with_prefix.html +//! [feature flags]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html +//! [skip_serializing_none]: https://docs.rs/serde_with/3.3.0/serde_with/attr.skip_serializing_none.html +//! [StringWithSeparator]: https://docs.rs/serde_with/3.3.0/serde_with/struct.StringWithSeparator.html +//! [user guide]: https://docs.rs/serde_with/3.3.0/serde_with/guide/index.html //! [with-annotation]: https://serde.rs/field-attrs.html#with -//! [as-annotation]: https://docs.rs/serde_with/3.2.0/serde_with/guide/serde_as/index.html +//! [as-annotation]: https://docs.rs/serde_with/3.3.0/serde_with/guide/serde_as/index.html #[cfg(feature = "alloc")] extern crate alloc; @@ -495,7 +495,7 @@ pub use serde_with_macros::*; /// # } /// ``` /// -/// [serde_as]: https://docs.rs/serde_with/3.2.0/serde_with/attr.serde_as.html +/// [serde_as]: https://docs.rs/serde_with/3.3.0/serde_with/attr.serde_as.html pub struct As(PhantomData); /// Adapter to convert from `serde_as` to the serde traits. @@ -927,7 +927,7 @@ pub struct BytesOrString; /// ``` /// /// [`chrono::Duration`]: ::chrono_0_4::Duration -/// [feature flag]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html +/// [feature flag]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html pub struct DurationSeconds< FORMAT: formats::Format = u64, STRICTNESS: formats::Strictness = formats::Strict, @@ -1059,7 +1059,7 @@ pub struct DurationSeconds< /// ``` /// /// [`chrono::Duration`]: ::chrono_0_4::Duration -/// [feature flag]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html +/// [feature flag]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html pub struct DurationSecondsWithFrac< FORMAT: formats::Format = f64, STRICTNESS: formats::Strictness = formats::Strict, @@ -1261,7 +1261,7 @@ pub struct DurationNanoSecondsWithFrac< /// [`SystemTime`]: std::time::SystemTime /// [`chrono::DateTime`]: ::chrono_0_4::DateTime /// [`chrono::DateTime`]: ::chrono_0_4::DateTime -/// [feature flag]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html +/// [feature flag]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html pub struct TimestampSeconds< FORMAT: formats::Format = i64, STRICTNESS: formats::Strictness = formats::Strict, @@ -1403,7 +1403,7 @@ pub struct TimestampSeconds< /// [`chrono::DateTime`]: ::chrono_0_4::DateTime /// [`chrono::DateTime`]: ::chrono_0_4::DateTime /// [NaiveDateTime]: ::chrono_0_4::NaiveDateTime -/// [feature flag]: https://docs.rs/serde_with/3.2.0/serde_with/guide/feature_flags/index.html +/// [feature flag]: https://docs.rs/serde_with/3.3.0/serde_with/guide/feature_flags/index.html pub struct TimestampSecondsWithFrac< FORMAT: formats::Format = f64, STRICTNESS: formats::Strictness = formats::Strict, diff --git a/serde_with_macros/CHANGELOG.md b/serde_with_macros/CHANGELOG.md index 1b10d43f..02741d49 100644 --- a/serde_with_macros/CHANGELOG.md +++ b/serde_with_macros/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [3.3.0] - 2023-08-19 + +No changes. + ## [3.2.0] - 2023-08-04 No changes. diff --git a/serde_with_macros/src/lib.rs b/serde_with_macros/src/lib.rs index fbae76db..ca7b5f04 100644 --- a/serde_with_macros/src/lib.rs +++ b/serde_with_macros/src/lib.rs @@ -26,7 +26,7 @@ #![doc(test(attr(warn(rust_2018_idioms))))] // Not needed for 2018 edition and conflicts with `rust_2018_idioms` #![doc(test(no_crate_inject))] -#![doc(html_root_url = "https://docs.rs/serde_with_macros/3.2.0/")] +#![doc(html_root_url = "https://docs.rs/serde_with_macros/3.3.0/")] // Necessary to silence the warning about clippy::unknown_clippy_lints on nightly #![allow(renamed_and_removed_lints)] // Necessary for nightly clippy lints @@ -590,8 +590,8 @@ fn field_has_attribute(field: &Field, namespace: &str, name: &str) -> bool { /// } /// ``` /// -/// [`serde_as`]: https://docs.rs/serde_with/3.2.0/serde_with/guide/index.html -/// [re-exporting `serde_as`]: https://docs.rs/serde_with/3.2.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as +/// [`serde_as`]: https://docs.rs/serde_with/3.3.0/serde_with/guide/index.html +/// [re-exporting `serde_as`]: https://docs.rs/serde_with/3.3.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as #[proc_macro_attribute] pub fn serde_as(args: TokenStream, input: TokenStream) -> TokenStream { #[derive(FromMeta)] @@ -1008,7 +1008,7 @@ fn has_type_embedded(type_: &Type, embedded_type: &syn::Ident) -> bool { /// [`Display`]: std::fmt::Display /// [`FromStr`]: std::str::FromStr /// [cargo-toml-rename]: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml -/// [serde-as-crate]: https://docs.rs/serde_with/3.2.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as +/// [serde-as-crate]: https://docs.rs/serde_with/3.3.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as /// [serde-crate]: https://serde.rs/container-attrs.html#crate #[proc_macro_derive(DeserializeFromStr, attributes(serde_with))] pub fn derive_deserialize_fromstr(item: TokenStream) -> TokenStream { @@ -1128,7 +1128,7 @@ fn deserialize_fromstr(mut input: DeriveInput, serde_with_crate_path: Path) -> T /// [`Display`]: std::fmt::Display /// [`FromStr`]: std::str::FromStr /// [cargo-toml-rename]: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml -/// [serde-as-crate]: https://docs.rs/serde_with/3.2.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as +/// [serde-as-crate]: https://docs.rs/serde_with/3.3.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as /// [serde-crate]: https://serde.rs/container-attrs.html#crate #[proc_macro_derive(SerializeDisplay, attributes(serde_with))] pub fn derive_serialize_display(item: TokenStream) -> TokenStream {