Skip to content

Commit

Permalink
Merge #592
Browse files Browse the repository at this point in the history
592: Bump version to v2.3.3 r=jonasbb a=jonasbb



Co-authored-by: Jonas Bushart <jonas@bushart.org>
  • Loading branch information
bors[bot] and jonasbb committed Apr 27, 2023
2 parents f95573c + 5a71920 commit a119325
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 30 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,14 @@ Foo::Bytes {
}
```

[`DisplayFromStr`]: https://docs.rs/serde_with/2.3.2/serde_with/struct.DisplayFromStr.html
[`with_prefix!`]: https://docs.rs/serde_with/2.3.2/serde_with/macro.with_prefix.html
[feature flags]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
[skip_serializing_none]: https://docs.rs/serde_with/2.3.2/serde_with/attr.skip_serializing_none.html
[StringWithSeparator]: https://docs.rs/serde_with/2.3.2/serde_with/struct.StringWithSeparator.html
[user guide]: https://docs.rs/serde_with/2.3.2/serde_with/guide/index.html
[`DisplayFromStr`]: https://docs.rs/serde_with/2.3.3/serde_with/struct.DisplayFromStr.html
[`with_prefix!`]: https://docs.rs/serde_with/2.3.3/serde_with/macro.with_prefix.html
[feature flags]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
[skip_serializing_none]: https://docs.rs/serde_with/2.3.3/serde_with/attr.skip_serializing_none.html
[StringWithSeparator]: https://docs.rs/serde_with/2.3.3/serde_with/struct.StringWithSeparator.html
[user guide]: https://docs.rs/serde_with/2.3.3/serde_with/guide/index.html
[with-annotation]: https://serde.rs/field-attrs.html#with
[as-annotation]: https://docs.rs/serde_with/2.3.2/serde_with/guide/serde_as/index.html
[as-annotation]: https://docs.rs/serde_with/2.3.3/serde_with/guide/serde_as/index.html

## License

Expand Down
2 changes: 2 additions & 0 deletions serde_with/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.3.3] - 2023-04-27

### Changed

* Update `syn` to v2 and `darling` to v0.20 (#578)
Expand Down
4 changes: 2 additions & 2 deletions serde_with/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = [
]
name = "serde_with"
rust-version = "1.60"
version = "2.3.2"
version = "2.3.3"

categories = ["encoding", "no-std"]
description = "Custom de/serialization functions for Rust's serde"
Expand Down Expand Up @@ -69,7 +69,7 @@ indexmap_1 = {package = "indexmap", version = "1.8", 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 = "=2.3.2", optional = true}
serde_with_macros = {path = "../serde_with_macros", version = "=2.3.3", optional = true}
time_0_3 = {package = "time", version = "~0.3.11", optional = true, default-features = false}

[dev-dependencies]
Expand Down
26 changes: 13 additions & 13 deletions serde_with/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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/2.3.2/")]
#![doc(html_root_url = "https://docs.rs/serde_with/2.3.3/")]
#![cfg_attr(docsrs, feature(doc_cfg))]
#![allow(
// clippy is broken and shows wrong warnings
Expand Down Expand Up @@ -281,14 +281,14 @@
//! # }
//! ```
//!
//! [`DisplayFromStr`]: https://docs.rs/serde_with/2.3.2/serde_with/struct.DisplayFromStr.html
//! [`with_prefix!`]: https://docs.rs/serde_with/2.3.2/serde_with/macro.with_prefix.html
//! [feature flags]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
//! [skip_serializing_none]: https://docs.rs/serde_with/2.3.2/serde_with/attr.skip_serializing_none.html
//! [StringWithSeparator]: https://docs.rs/serde_with/2.3.2/serde_with/struct.StringWithSeparator.html
//! [user guide]: https://docs.rs/serde_with/2.3.2/serde_with/guide/index.html
//! [`DisplayFromStr`]: https://docs.rs/serde_with/2.3.3/serde_with/struct.DisplayFromStr.html
//! [`with_prefix!`]: https://docs.rs/serde_with/2.3.3/serde_with/macro.with_prefix.html
//! [feature flags]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
//! [skip_serializing_none]: https://docs.rs/serde_with/2.3.3/serde_with/attr.skip_serializing_none.html
//! [StringWithSeparator]: https://docs.rs/serde_with/2.3.3/serde_with/struct.StringWithSeparator.html
//! [user guide]: https://docs.rs/serde_with/2.3.3/serde_with/guide/index.html
//! [with-annotation]: https://serde.rs/field-attrs.html#with
//! [as-annotation]: https://docs.rs/serde_with/2.3.2/serde_with/guide/serde_as/index.html
//! [as-annotation]: https://docs.rs/serde_with/2.3.3/serde_with/guide/serde_as/index.html

#[cfg(feature = "alloc")]
extern crate alloc;
Expand Down Expand Up @@ -495,7 +495,7 @@ pub use serde_with_macros::*;
/// # }
/// ```
///
/// [serde_as]: https://docs.rs/serde_with/2.3.2/serde_with/attr.serde_as.html
/// [serde_as]: https://docs.rs/serde_with/2.3.3/serde_with/attr.serde_as.html
pub struct As<T: ?Sized>(PhantomData<T>);

/// Adapter to convert from `serde_as` to the serde traits.
Expand Down Expand Up @@ -926,7 +926,7 @@ pub struct BytesOrString;
/// ```
///
/// [`chrono::Duration`]: ::chrono_0_4::Duration
/// [feature flag]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
/// [feature flag]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
pub struct DurationSeconds<
FORMAT: formats::Format = u64,
STRICTNESS: formats::Strictness = formats::Strict,
Expand Down Expand Up @@ -1057,7 +1057,7 @@ pub struct DurationSeconds<
/// ```
///
/// [`chrono::Duration`]: ::chrono_0_4::Duration
/// [feature flag]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
/// [feature flag]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
pub struct DurationSecondsWithFrac<
FORMAT: formats::Format = f64,
STRICTNESS: formats::Strictness = formats::Strict,
Expand Down Expand Up @@ -1258,7 +1258,7 @@ pub struct DurationNanoSecondsWithFrac<
/// [`SystemTime`]: std::time::SystemTime
/// [`chrono::DateTime<Local>`]: ::chrono_0_4::DateTime
/// [`chrono::DateTime<Utc>`]: ::chrono_0_4::DateTime
/// [feature flag]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
/// [feature flag]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
pub struct TimestampSeconds<
FORMAT: formats::Format = i64,
STRICTNESS: formats::Strictness = formats::Strict,
Expand Down Expand Up @@ -1399,7 +1399,7 @@ pub struct TimestampSeconds<
/// [`chrono::DateTime<Local>`]: ::chrono_0_4::DateTime
/// [`chrono::DateTime<Utc>`]: ::chrono_0_4::DateTime
/// [NaiveDateTime]: ::chrono_0_4::NaiveDateTime
/// [feature flag]: https://docs.rs/serde_with/2.3.2/serde_with/guide/feature_flags/index.html
/// [feature flag]: https://docs.rs/serde_with/2.3.3/serde_with/guide/feature_flags/index.html
pub struct TimestampSecondsWithFrac<
FORMAT: formats::Format = f64,
STRICTNESS: formats::Strictness = formats::Strict,
Expand Down
2 changes: 2 additions & 0 deletions serde_with_macros/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.3.3] - 2023-04-27

### Changed

* Update `syn` to v2 and `darling` to v0.20 (#578)
Expand Down
2 changes: 1 addition & 1 deletion serde_with_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Jonas Bushart"]
name = "serde_with_macros"
rust-version = "1.60"
version = "2.3.2"
version = "2.3.3"

categories = ["encoding"]
description = "proc-macro library for serde_with"
Expand Down
10 changes: 5 additions & 5 deletions serde_with_macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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/2.3.2/")]
#![doc(html_root_url = "https://docs.rs/serde_with_macros/2.3.3/")]
// Necessary to silence the warning about clippy::unknown_clippy_lints on nightly
#![allow(renamed_and_removed_lints)]
// Necessary for nightly clippy lints
Expand Down Expand Up @@ -590,8 +590,8 @@ fn field_has_attribute(field: &Field, namespace: &str, name: &str) -> bool {
/// }
/// ```
///
/// [`serde_as`]: https://docs.rs/serde_with/2.3.2/serde_with/guide/index.html
/// [re-exporting `serde_as`]: https://docs.rs/serde_with/2.3.2/serde_with/guide/serde_as/index.html#re-exporting-serde_as
/// [`serde_as`]: https://docs.rs/serde_with/2.3.3/serde_with/guide/index.html
/// [re-exporting `serde_as`]: https://docs.rs/serde_with/2.3.3/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)]
Expand Down Expand Up @@ -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/2.3.2/serde_with/guide/serde_as/index.html#re-exporting-serde_as
/// [serde-as-crate]: https://docs.rs/serde_with/2.3.3/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 {
Expand Down Expand Up @@ -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/2.3.2/serde_with/guide/serde_as/index.html#re-exporting-serde_as
/// [serde-as-crate]: https://docs.rs/serde_with/2.3.3/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 {
Expand Down

0 comments on commit a119325

Please sign in to comment.