Merge pull request #649 from DaniPopes/serde_core

Depend on `serde_core` instead of `serde`

Author: Amanieu

Cargo.toml

@@ -18,7 +18,7 @@ foldhash = { version = "0.2.0", default-features = false, optional = true }
 
 # For external trait impls
 rayon = { version = "1.2", optional = true }
-serde = { version = "1.0.25", default-features = false, optional = true }
+serde_core = { version = "1.0.221", default-features = false, optional = true }
 
 # When built as part of libstd
 core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
@@ -33,6 +33,11 @@ allocator-api2 = { version = "0.2.9", optional = true, default-features = false,
 # NB: this is a public dependency because `Equivalent` is re-exported!
 equivalent = { version = "1.0", optional = true, default-features = false }
 
+# serde v1.0.220 is the first version that released with `serde_core`.
+# This is required to avoid conflict with other `serde` users which may require an older version.
+[target.'cfg(any())'.dependencies]
+serde = { version = "1.0.220", default-features = false, optional = true }
+
 [dev-dependencies]
 lazy_static = "1.4"
 rand = { version = "0.9.0", features = ["small_rng"] }
@@ -60,6 +65,9 @@ rustc-dep-of-std = [
     "rustc-internal-api",
 ]
 
+# Enables serde support.
+serde = ["dep:serde_core", "dep:serde"]
+
 # Enables the deprecated RawEntry API.
 raw-entry = []
 

src/external_trait_impls/serde.rs

@@ -15,8 +15,8 @@ mod map {
     use core::fmt;
     use core::hash::{BuildHasher, Hash};
     use core::marker::PhantomData;
-    use serde::de::{Deserialize, Deserializer, MapAccess, Visitor};
-    use serde::ser::{Serialize, Serializer};
+    use serde_core::de::{Deserialize, Deserializer, MapAccess, Visitor};
+    use serde_core::ser::{Serialize, Serializer};
 
     use crate::hash_map::HashMap;
 
@@ -101,8 +101,8 @@ mod set {
     use core::fmt;
     use core::hash::{BuildHasher, Hash};
     use core::marker::PhantomData;
-    use serde::de::{Deserialize, Deserializer, SeqAccess, Visitor};
-    use serde::ser::{Serialize, Serializer};
+    use serde_core::de::{Deserialize, Deserializer, SeqAccess, Visitor};
+    use serde_core::ser::{Serialize, Serializer};
 
     use crate::hash_set::HashSet;