Skip to content

Commit 20fae7c

Browse files
bors[bot]jonasbb
andauthored
Merge #619
619: Bump version to v3.1.0 r=jonasbb a=jonasbb bors r+ Co-authored-by: Jonas Bushart <[email protected]>
2 parents e530987 + b4eaed6 commit 20fae7c

File tree

8 files changed

+44
-30
lines changed

8 files changed

+44
-30
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ Foo::Bytes {
183183
}
184184
```
185185

186-
[`DisplayFromStr`]: https://docs.rs/serde_with/3.0.0/serde_with/struct.DisplayFromStr.html
187-
[`with_prefix!`]: https://docs.rs/serde_with/3.0.0/serde_with/macro.with_prefix.html
188-
[feature flags]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
189-
[skip_serializing_none]: https://docs.rs/serde_with/3.0.0/serde_with/attr.skip_serializing_none.html
190-
[StringWithSeparator]: https://docs.rs/serde_with/3.0.0/serde_with/struct.StringWithSeparator.html
191-
[user guide]: https://docs.rs/serde_with/3.0.0/serde_with/guide/index.html
186+
[`DisplayFromStr`]: https://docs.rs/serde_with/3.1.0/serde_with/struct.DisplayFromStr.html
187+
[`with_prefix!`]: https://docs.rs/serde_with/3.1.0/serde_with/macro.with_prefix.html
188+
[feature flags]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
189+
[skip_serializing_none]: https://docs.rs/serde_with/3.1.0/serde_with/attr.skip_serializing_none.html
190+
[StringWithSeparator]: https://docs.rs/serde_with/3.1.0/serde_with/struct.StringWithSeparator.html
191+
[user guide]: https://docs.rs/serde_with/3.1.0/serde_with/guide/index.html
192192
[with-annotation]: https://serde.rs/field-attrs.html#with
193-
[as-annotation]: https://docs.rs/serde_with/3.0.0/serde_with/guide/serde_as/index.html
193+
[as-annotation]: https://docs.rs/serde_with/3.1.0/serde_with/guide/serde_as/index.html
194194

195195
## License
196196

serde_with/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [3.1.0] - 2023-07-17
11+
12+
### Added
13+
14+
* Add `FromIntoRef` and `TryFromIntoRef` (#618)
15+
Thanks to @oblique for submitting the PR.
16+
17+
The new types are similar to the existing `FromInto` and `TryFromInto` types.
18+
They behave different during serialization, allowing the removal of the `Clone` bound on their `SerializeAs` trait implementation
19+
1020
### Changed
1121

1222
* Improve documentation about cfg-gating `serde_as` (#607)

serde_with/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = [
66
]
77
name = "serde_with"
88
rust-version = "1.61"
9-
version = "3.0.0"
9+
version = "3.1.0"
1010

1111
categories = ["encoding", "no-std", "no-std::no-alloc"]
1212
description = "Custom de/serialization functions for Rust's serde"
@@ -69,7 +69,7 @@ indexmap_1 = {package = "indexmap", version = "1.8", optional = true, default-fe
6969
# https://github.com/jonasbb/serde_with/blob/eb1965a74a3be073ecd13ec05f02a01bc1c44309/serde_with/src/flatten_maybe.rs#L67
7070
serde = {version = "1.0.157", default-features = false, features = ["derive"] }
7171
serde_json = {version = "1.0.45", optional = true, default-features = false}
72-
serde_with_macros = {path = "../serde_with_macros", version = "=3.0.0", optional = true}
72+
serde_with_macros = {path = "../serde_with_macros", version = "=3.1.0", optional = true}
7373
time_0_3 = {package = "time", version = "~0.3.11", optional = true, default-features = false}
7474

7575
[dev-dependencies]

serde_with/src/lib.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![doc(test(attr(warn(rust_2018_idioms))))]
2727
// Not needed for 2018 edition and conflicts with `rust_2018_idioms`
2828
#![doc(test(no_crate_inject))]
29-
#![doc(html_root_url = "https://docs.rs/serde_with/3.0.0/")]
29+
#![doc(html_root_url = "https://docs.rs/serde_with/3.1.0/")]
3030
#![cfg_attr(docsrs, feature(doc_cfg))]
3131
#![allow(
3232
// clippy is broken and shows wrong warnings
@@ -281,14 +281,14 @@
281281
//! # }
282282
//! ```
283283
//!
284-
//! [`DisplayFromStr`]: https://docs.rs/serde_with/3.0.0/serde_with/struct.DisplayFromStr.html
285-
//! [`with_prefix!`]: https://docs.rs/serde_with/3.0.0/serde_with/macro.with_prefix.html
286-
//! [feature flags]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
287-
//! [skip_serializing_none]: https://docs.rs/serde_with/3.0.0/serde_with/attr.skip_serializing_none.html
288-
//! [StringWithSeparator]: https://docs.rs/serde_with/3.0.0/serde_with/struct.StringWithSeparator.html
289-
//! [user guide]: https://docs.rs/serde_with/3.0.0/serde_with/guide/index.html
284+
//! [`DisplayFromStr`]: https://docs.rs/serde_with/3.1.0/serde_with/struct.DisplayFromStr.html
285+
//! [`with_prefix!`]: https://docs.rs/serde_with/3.1.0/serde_with/macro.with_prefix.html
286+
//! [feature flags]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
287+
//! [skip_serializing_none]: https://docs.rs/serde_with/3.1.0/serde_with/attr.skip_serializing_none.html
288+
//! [StringWithSeparator]: https://docs.rs/serde_with/3.1.0/serde_with/struct.StringWithSeparator.html
289+
//! [user guide]: https://docs.rs/serde_with/3.1.0/serde_with/guide/index.html
290290
//! [with-annotation]: https://serde.rs/field-attrs.html#with
291-
//! [as-annotation]: https://docs.rs/serde_with/3.0.0/serde_with/guide/serde_as/index.html
291+
//! [as-annotation]: https://docs.rs/serde_with/3.1.0/serde_with/guide/serde_as/index.html
292292
293293
#[cfg(feature = "alloc")]
294294
extern crate alloc;
@@ -495,7 +495,7 @@ pub use serde_with_macros::*;
495495
/// # }
496496
/// ```
497497
///
498-
/// [serde_as]: https://docs.rs/serde_with/3.0.0/serde_with/attr.serde_as.html
498+
/// [serde_as]: https://docs.rs/serde_with/3.1.0/serde_with/attr.serde_as.html
499499
pub struct As<T: ?Sized>(PhantomData<T>);
500500

501501
/// Adapter to convert from `serde_as` to the serde traits.
@@ -926,7 +926,7 @@ pub struct BytesOrString;
926926
/// ```
927927
///
928928
/// [`chrono::Duration`]: ::chrono_0_4::Duration
929-
/// [feature flag]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
929+
/// [feature flag]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
930930
pub struct DurationSeconds<
931931
FORMAT: formats::Format = u64,
932932
STRICTNESS: formats::Strictness = formats::Strict,
@@ -1057,7 +1057,7 @@ pub struct DurationSeconds<
10571057
/// ```
10581058
///
10591059
/// [`chrono::Duration`]: ::chrono_0_4::Duration
1060-
/// [feature flag]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
1060+
/// [feature flag]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
10611061
pub struct DurationSecondsWithFrac<
10621062
FORMAT: formats::Format = f64,
10631063
STRICTNESS: formats::Strictness = formats::Strict,
@@ -1258,7 +1258,7 @@ pub struct DurationNanoSecondsWithFrac<
12581258
/// [`SystemTime`]: std::time::SystemTime
12591259
/// [`chrono::DateTime<Local>`]: ::chrono_0_4::DateTime
12601260
/// [`chrono::DateTime<Utc>`]: ::chrono_0_4::DateTime
1261-
/// [feature flag]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
1261+
/// [feature flag]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
12621262
pub struct TimestampSeconds<
12631263
FORMAT: formats::Format = i64,
12641264
STRICTNESS: formats::Strictness = formats::Strict,
@@ -1399,7 +1399,7 @@ pub struct TimestampSeconds<
13991399
/// [`chrono::DateTime<Local>`]: ::chrono_0_4::DateTime
14001400
/// [`chrono::DateTime<Utc>`]: ::chrono_0_4::DateTime
14011401
/// [NaiveDateTime]: ::chrono_0_4::NaiveDateTime
1402-
/// [feature flag]: https://docs.rs/serde_with/3.0.0/serde_with/guide/feature_flags/index.html
1402+
/// [feature flag]: https://docs.rs/serde_with/3.1.0/serde_with/guide/feature_flags/index.html
14031403
pub struct TimestampSecondsWithFrac<
14041404
FORMAT: formats::Format = f64,
14051405
STRICTNESS: formats::Strictness = formats::Strict,

serde_with_macros/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [3.1.0] - 2023-07-17
11+
12+
No changes.
13+
1014
## [3.0.0] - 2023-05-01
1115

1216
No changes.

serde_with_macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Jonas Bushart"]
33
name = "serde_with_macros"
44
rust-version = "1.61"
5-
version = "3.0.0"
5+
version = "3.1.0"
66

77
categories = ["encoding"]
88
description = "proc-macro library for serde_with"

serde_with_macros/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![doc(test(attr(warn(rust_2018_idioms))))]
2727
// Not needed for 2018 edition and conflicts with `rust_2018_idioms`
2828
#![doc(test(no_crate_inject))]
29-
#![doc(html_root_url = "https://docs.rs/serde_with_macros/3.0.0/")]
29+
#![doc(html_root_url = "https://docs.rs/serde_with_macros/3.1.0/")]
3030
// Necessary to silence the warning about clippy::unknown_clippy_lints on nightly
3131
#![allow(renamed_and_removed_lints)]
3232
// Necessary for nightly clippy lints
@@ -590,8 +590,8 @@ fn field_has_attribute(field: &Field, namespace: &str, name: &str) -> bool {
590590
/// }
591591
/// ```
592592
///
593-
/// [`serde_as`]: https://docs.rs/serde_with/3.0.0/serde_with/guide/index.html
594-
/// [re-exporting `serde_as`]: https://docs.rs/serde_with/3.0.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
593+
/// [`serde_as`]: https://docs.rs/serde_with/3.1.0/serde_with/guide/index.html
594+
/// [re-exporting `serde_as`]: https://docs.rs/serde_with/3.1.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
595595
#[proc_macro_attribute]
596596
pub fn serde_as(args: TokenStream, input: TokenStream) -> TokenStream {
597597
#[derive(FromMeta)]
@@ -1008,7 +1008,7 @@ fn has_type_embedded(type_: &Type, embedded_type: &syn::Ident) -> bool {
10081008
/// [`Display`]: std::fmt::Display
10091009
/// [`FromStr`]: std::str::FromStr
10101010
/// [cargo-toml-rename]: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml
1011-
/// [serde-as-crate]: https://docs.rs/serde_with/3.0.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
1011+
/// [serde-as-crate]: https://docs.rs/serde_with/3.1.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
10121012
/// [serde-crate]: https://serde.rs/container-attrs.html#crate
10131013
#[proc_macro_derive(DeserializeFromStr, attributes(serde_with))]
10141014
pub fn derive_deserialize_fromstr(item: TokenStream) -> TokenStream {
@@ -1128,7 +1128,7 @@ fn deserialize_fromstr(mut input: DeriveInput, serde_with_crate_path: Path) -> T
11281128
/// [`Display`]: std::fmt::Display
11291129
/// [`FromStr`]: std::str::FromStr
11301130
/// [cargo-toml-rename]: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml
1131-
/// [serde-as-crate]: https://docs.rs/serde_with/3.0.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
1131+
/// [serde-as-crate]: https://docs.rs/serde_with/3.1.0/serde_with/guide/serde_as/index.html#re-exporting-serde_as
11321132
/// [serde-crate]: https://serde.rs/container-attrs.html#crate
11331133
#[proc_macro_derive(SerializeDisplay, attributes(serde_with))]
11341134
pub fn derive_serialize_display(item: TokenStream) -> TokenStream {

0 commit comments

Comments
 (0)