From c650dc19db33de49f3c764a6272ffad3e5d22aff Mon Sep 17 00:00:00 2001
From: Alexander Shishenko <alex@shishenko.com>
Date: Thu, 8 Sep 2022 11:30:43 +0300
Subject: [PATCH] *: Replace _serde with dep:serde in Cargo.toml (#2868)

---
 core/Cargo.toml             | 4 ++--
 core/src/lib.rs             | 3 ---
 core/src/peer_id.rs         | 2 +-
 core/tests/serde.rs         | 2 --
 protocols/kad/Cargo.toml    | 4 ++--
 protocols/kad/src/lib.rs    | 3 ---
 protocols/kad/src/record.rs | 1 -
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 626daf2c..3e5285ef 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -37,7 +37,7 @@ thiserror = "1.0"
 unsigned-varint = "0.7"
 void = "1"
 zeroize = "1"
-_serde = { package = "serde", version = "1", optional = true, features = ["derive"] }
+serde = { version = "1", optional = true, features = ["derive"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 ring = { version = "0.16.9", features = ["alloc", "std"], default-features = false, optional = true}
@@ -63,7 +63,7 @@ default = [ "secp256k1", "ecdsa" ]
 secp256k1 = [ "libsecp256k1" ]
 ecdsa = [ "p256" ]
 rsa = [ "dep:ring" ]
-serde = ["multihash/serde-codec", "_serde"]
+serde = ["multihash/serde-codec", "dep:serde"]
 
 [[bench]]
 name = "peer_id"
diff --git a/core/src/lib.rs b/core/src/lib.rs
index fc5b6c24..ac55537e 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -35,9 +35,6 @@
 //!   define how to upgrade each individual substream to use a protocol.
 //!   See the `upgrade` module.
 
-#[cfg(feature = "serde")]
-extern crate _serde as serde;
-
 #[allow(clippy::derive_partial_eq_without_eq)]
 mod keys_proto {
     include!(concat!(env!("OUT_DIR"), "/keys_proto.rs"));
diff --git a/core/src/peer_id.rs b/core/src/peer_id.rs
index d5e4e149..cbe0a133 100644
--- a/core/src/peer_id.rs
+++ b/core/src/peer_id.rs
@@ -183,7 +183,7 @@ impl From<PeerId> for Vec<u8> {
 impl Serialize for PeerId {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: _serde::Serializer,
+        S: serde::Serializer,
     {
         if serializer.is_human_readable() {
             serializer.serialize_str(&self.to_base58())
diff --git a/core/tests/serde.rs b/core/tests/serde.rs
index 3bb98d4a..35796902 100644
--- a/core/tests/serde.rs
+++ b/core/tests/serde.rs
@@ -4,8 +4,6 @@ use std::str::FromStr;
 
 use libp2p_core::PeerId;
 
-extern crate _serde as serde;
-
 #[test]
 pub fn serialize_peer_id_json() {
     let peer_id = PeerId::from_str("12D3KooWRNw2pJC9748Fmq4WNV27HoSTcX3r37132FLkQMrbKAiC").unwrap();
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 5ccf32b9..9aec22c6 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -29,7 +29,7 @@ unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] }
 void = "1.0"
 futures-timer = "3.0.2"
 instant = "0.1.11"
-_serde = { package = "serde", version = "1.0", optional = true, features = ["derive"] }
+serde = { version = "1.0", optional = true, features = ["derive"] }
 thiserror = "1"
 
 [dev-dependencies]
@@ -43,4 +43,4 @@ quickcheck = "0.9.0"
 prost-build = "0.11"
 
 [features]
-serde = ["_serde", "bytes/serde"]
+serde = ["dep:serde", "bytes/serde"]
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 8c000a00..de6f8159 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -39,9 +39,6 @@
 //       be useful later for record store
 #![allow(dead_code)]
 
-#[cfg(feature = "serde")]
-extern crate _serde as serde;
-
 pub mod handler;
 pub mod kbucket;
 pub mod protocol;
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
index e321992e..2a40292c 100644
--- a/protocols/kad/src/record.rs
+++ b/protocols/kad/src/record.rs
@@ -32,7 +32,6 @@ use std::hash::{Hash, Hasher};
 
 /// The (opaque) key of a record.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "_serde"))]
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Key(Bytes);