Explicitly use serde-feature for serde impls

Author: stevenroose

src/address.rs

@@ -30,7 +30,7 @@ use bitcoin::util::base58;
 use bitcoin::PublicKey;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1;
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 use serde;
 
 use blech32;
@@ -595,7 +595,7 @@ impl FromStr for Address {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl<'de> serde::Deserialize<'de> for Address {
     #[inline]
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
@@ -638,7 +638,7 @@ impl<'de> serde::Deserialize<'de> for Address {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl serde::Serialize for Address {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -654,8 +654,6 @@ mod test {
     use bitcoin::util::key;
     use bitcoin::Script;
     use bitcoin::secp256k1::{PublicKey, Secp256k1};
-    #[cfg(feature = "serde")]
-    use serde_json;
 
     fn roundtrips(addr: &Address) {
         assert_eq!(
@@ -670,9 +668,9 @@ mod test {
             "script round-trip failed for {}",
             addr,
         );
-        #[cfg(feature = "serde")]
+        #[cfg(feature = "serde-feature")]
         assert_eq!(
-            serde_json::from_value::<Address>(serde_json::to_value(&addr).unwrap()).ok().as_ref(),
+            ::serde_json::from_value::<Address>(serde_json::to_value(&addr).unwrap()).ok().as_ref(),
             Some(addr)
         );
     }

src/block.rs

@@ -21,8 +21,8 @@ use bitcoin;
 use bitcoin::blockdata::script::Script;
 use bitcoin::{BitcoinHash, BlockHash, VarInt};
 use bitcoin::hashes::{Hash, sha256};
-#[cfg(feature = "serde")] use serde::{Deserialize, Deserializer, Serialize, Serializer};
-#[cfg(feature = "serde")] use std::fmt;
+#[cfg(feature = "serde-feature")] use serde::{Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(feature = "serde-feature")] use std::fmt;
 
 use dynafed;
 use Transaction;
@@ -49,7 +49,7 @@ pub enum ExtData {
     },
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl<'de> Deserialize<'de> for ExtData {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
         use serde::de;
@@ -149,7 +149,7 @@ impl<'de> Deserialize<'de> for ExtData {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl Serialize for ExtData {
     fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
         use serde::ser::SerializeStruct;

src/confidential.rs

@@ -17,7 +17,7 @@
 //! Structures representing Pedersen commitments of various types
 //!
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use std::{io, fmt};
@@ -137,7 +137,7 @@ macro_rules! impl_confidential_commitment {
             }
         }
 
-        #[cfg(feature = "serde")]
+        #[cfg(feature = "serde-feature")]
         impl Serialize for $name {
             fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
                 use serde::ser::SerializeSeq;
@@ -161,7 +161,7 @@ macro_rules! impl_confidential_commitment {
             }
         }
 
-        #[cfg(feature = "serde")]
+        #[cfg(feature = "serde-feature")]
         impl<'de> Deserialize<'de> for $name {
             fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
                 use serde::de::{Error, Visitor, SeqAccess};

src/dynafed.rs

@@ -18,8 +18,8 @@ use std::io;
 
 use bitcoin;
 use bitcoin::hashes::{Hash, sha256, sha256d};
-#[cfg(feature = "serde")] use serde::{Deserialize, Deserializer, Serialize, Serializer};
-#[cfg(feature = "serde")] use std::fmt;
+#[cfg(feature = "serde-feature")] use serde::{Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(feature = "serde-feature")] use std::fmt;
 
 use encode::{self, Encodable, Decodable};
 
@@ -216,7 +216,7 @@ impl Params {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl<'de> Deserialize<'de> for Params {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
         use serde::de;
@@ -355,7 +355,7 @@ impl<'de> Deserialize<'de> for Params {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "serde-feature")]
 impl Serialize for Params {
     fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
         use serde::ser::SerializeStruct;

src/internal_macros.rs

@@ -36,7 +36,7 @@ macro_rules! impl_consensus_encoding {
 
 macro_rules! serde_struct_impl {
     ($name:ident, $($fe:ident),*) => (
-        #[cfg(feature = "serde")]
+        #[cfg(feature = "serde-feature")]
         impl<'de> $crate::serde::Deserialize<'de> for $name {
             fn deserialize<D>(deserializer: D) -> Result<$name, D::Error>
             where
@@ -131,7 +131,7 @@ macro_rules! serde_struct_impl {
             }
         }
 
-        #[cfg(feature = "serde")]
+        #[cfg(feature = "serde-feature")]
         impl $crate::serde::Serialize for $name {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where