Skip to content

Commit 195b8d8

Browse files
authored
Merge pull request #15 from cuviper/release-0.5.11
Release 0.5.11
2 parents 2376953 + cc64995 commit 195b8d8

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

Cargo.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "ordermap"
33
edition = "2021"
4-
version = "0.5.10"
4+
version = "0.5.11"
55
documentation = "https://docs.rs/ordermap/"
66
repository = "https://github.com/indexmap-rs/ordermap"
77
license = "Apache-2.0 OR MIT"
@@ -14,21 +14,26 @@ rust-version = "1.63"
1414
bench = false
1515

1616
[dependencies]
17-
indexmap = { version = "2.11.1", default-features = false }
17+
indexmap = { version = "2.11.2", default-features = false }
1818

1919
arbitrary = { version = "1.0", optional = true, default-features = false }
2020
quickcheck = { version = "1.0", optional = true, default-features = false }
21-
serde = { version = "1.0", optional = true, default-features = false }
21+
serde_core = { version = "1.0.220", optional = true, default-features = false }
2222
borsh = { version = "1.5.6", optional = true, default-features = false }
2323
rayon = { version = "1.9", optional = true }
2424
sval = { version = "2", optional = true, default-features = false }
2525

26+
# serde v1.0.220 is the first version that released with `serde_core`.
27+
# This is required to avoid conflict with other `serde` users which may require an older version.
28+
[target.'cfg(any())'.dependencies]
29+
serde = { version = "1.0.220", default-features = false }
30+
2631
[dev-dependencies]
2732
itertools = "0.14"
2833
fastrand = { version = "2", default-features = false }
2934
quickcheck = { version = "1.0", default-features = false }
3035
fnv = "1.0"
31-
serde_derive = "1.0"
36+
serde = { version = "1.0", default-features = false, features = ["derive"] }
3237

3338
[features]
3439
default = ["std"]
@@ -37,7 +42,7 @@ std = ["indexmap/std"]
3742
arbitrary = ["dep:arbitrary", "indexmap/arbitrary"]
3843
quickcheck = ["dep:quickcheck", "indexmap/quickcheck"]
3944
rayon = ["dep:rayon", "indexmap/rayon"]
40-
serde = ["dep:serde", "indexmap/serde"]
45+
serde = ["dep:serde_core", "indexmap/serde"]
4146
sval = ["dep:sval", "indexmap/sval"]
4247
borsh = ["dep:borsh", "borsh/indexmap"]
4348

RELEASES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Releases
22

3+
## 0.5.11 (2025-09-15)
4+
5+
- Switched the "serde" feature to depend on `serde_core`, improving build
6+
parallelism in cases where other dependents have enabled "serde/derive".
7+
38
## 0.5.10 (2025-09-08)
49

510
- Added a `get_key_value_mut` method to `OrderMap`.

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
//!
4646
//! [feature flags]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
4747
//! [`no_std`]: #no-standard-library-targets
48-
//! [`Serialize`]: `::serde::Serialize`
49-
//! [`Deserialize`]: `::serde::Deserialize`
48+
//! [`Serialize`]: `::serde_core::Serialize`
49+
//! [`Deserialize`]: `::serde_core::Deserialize`
5050
//! [`BorshSerialize`]: `::borsh::BorshSerialize`
5151
//! [`BorshDeserialize`]: `::borsh::BorshDeserialize`
5252
//! [`arbitrary::Arbitrary`]: `::arbitrary::Arbitrary`

src/map/serde_seq.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! ```
1111
//! # use ordermap::OrderMap;
12-
//! # use serde_derive::{Deserialize, Serialize};
12+
//! # use serde::{Deserialize, Serialize};
1313
//! #[derive(Deserialize, Serialize)]
1414
//! struct Data {
1515
//! #[serde(with = "ordermap::map::serde_seq")]
@@ -21,16 +21,16 @@
2121
use crate::OrderMap;
2222
use core::hash::{BuildHasher, Hash};
2323
use indexmap::map::serde_seq as ix;
24-
use serde::de::{Deserialize, Deserializer};
25-
use serde::ser::{Serialize, Serializer};
24+
use serde_core::de::{Deserialize, Deserializer};
25+
use serde_core::ser::{Serialize, Serializer};
2626

2727
/// Serializes an [`OrderMap`] as an ordered sequence.
2828
///
2929
/// This function may be used in a field attribute for deriving [`Serialize`]:
3030
///
3131
/// ```
3232
/// # use ordermap::OrderMap;
33-
/// # use serde_derive::Serialize;
33+
/// # use serde::Serialize;
3434
/// #[derive(Serialize)]
3535
/// struct Data {
3636
/// #[serde(serialize_with = "ordermap::map::serde_seq::serialize")]
@@ -53,7 +53,7 @@ where
5353
///
5454
/// ```
5555
/// # use ordermap::OrderMap;
56-
/// # use serde_derive::Deserialize;
56+
/// # use serde::Deserialize;
5757
/// #[derive(Deserialize)]
5858
/// struct Data {
5959
/// #[serde(deserialize_with = "ordermap::map::serde_seq::deserialize")]

src/serde.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
use crate::{OrderMap, OrderSet};
44
use core::hash::{BuildHasher, Hash};
5-
use serde::de::value::{MapDeserializer, SeqDeserializer};
6-
use serde::de::{Deserialize, Deserializer, Error, IntoDeserializer};
7-
use serde::ser::{Serialize, Serializer};
5+
use serde_core::de::value::{MapDeserializer, SeqDeserializer};
6+
use serde_core::de::{Deserialize, Deserializer, Error, IntoDeserializer};
7+
use serde_core::ser::{Serialize, Serializer};
88

99
impl<K, V, S> Serialize for OrderMap<K, V, S>
1010
where

0 commit comments

Comments
 (0)