Merge commit '27bc329b' into 2022-10--update-elements (PR #449)

PR 449: Add feature "serde"

Author: apoelstra

Cargo.toml

@@ -11,26 +11,25 @@ edition = "2018"
 compiler = []
 trace = []
 unstable = []
-default = []
-use-serde = ["bitcoin/use-serde", "serde"]
+serde = ["actual-serde", "bitcoin/use-serde"]
 rand = ["bitcoin/rand"]
 
 [dependencies]
 bitcoin = "0.28.1"
 elements = "0.19.0"
 bitcoin-miniscript = {package = "miniscript", git = "https://github.com/rust-bitcoin/rust-miniscript", rev = "c7c39f1e9d1b8da9e2c9318a61fb508553619e6c"}
 
+# Do NOT use this as a feature! Use the `serde` feature instead.
+actual-serde = { package = "serde", version = "1.0", optional = true }
+
+
 [dev-dependencies]
 serde_json = "<=1.0.44"
 ryu = "<1.0.5"
 elementsd = {version = "0.5.0", features=["0_21_0","bitcoind_22_0"]}
 actual-rand = { package = "rand", version = "0.8.4"}
 secp256k1 = {version = "0.22.1", features = ["rand-std"]}
 
-[dependencies.serde]
-version = "1.0"
-optional = true
-
 [[example]]
 name = "htlc"
 required-features = ["compiler"]

contrib/test.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-FEATURES="compiler use-serde rand"
+FEATURES="compiler serde rand"
 
 cargo --version
 rustc --version

src/lib.rs

@@ -112,7 +112,7 @@ compile_error!(
 
 pub use {bitcoin, elements};
 #[cfg(feature = "serde")]
-pub extern crate serde;
+pub use actual_serde as serde;
 #[cfg(all(test, feature = "unstable"))]
 extern crate test;
 

src/macros.rs

@@ -128,7 +128,7 @@ macro_rules! impl_block_str {
 macro_rules! serde_string_impl_pk {
     ($name:ident, $expecting:expr $(, $gen:ident; $gen_con:ident)* $(=> $ext:ident ; $ext_bound:ident)*) => {
         #[cfg(feature = "serde")]
-        impl<'de, Pk $(, $gen)* $(, $ext)*> serde::Deserialize<'de> for $name<Pk $(, $gen)* $(, $ext)* >
+        impl<'de, Pk $(, $gen)* $(, $ext)*> $crate::serde::Deserialize<'de> for $name<Pk $(, $gen)* $(, $ext)* >
         where
             Pk: $crate::MiniscriptKey + core::str::FromStr,
             Pk::RawPkHash: core::str::FromStr,
@@ -152,15 +152,15 @@ macro_rules! serde_string_impl_pk {
         {
             fn deserialize<D>(deserializer: D) -> Result<$name<Pk $(, $gen)* $(, $ext)*>, D::Error>
             where
-                D: serde::de::Deserializer<'de>,
+                D: $crate::serde::de::Deserializer<'de>,
             {
                 use std::fmt::{self, Formatter};
                 use std::marker::PhantomData;
                 use std::str::FromStr;
 
                 #[allow(unused_parens)]
                 struct Visitor<Pk $(, $gen)* $(, $ext)*>(PhantomData<(Pk $(, $gen)* $(, $ext)*)>);
-                impl<'de, Pk $(, $gen)* $(, $ext)*> serde::de::Visitor<'de> for Visitor<Pk $(, $gen)* $(, $ext)*>
+                impl<'de, Pk $(, $gen)* $(, $ext)*> $crate::serde::de::Visitor<'de> for Visitor<Pk $(, $gen)* $(, $ext)*>
                 where
                     Pk: $crate::MiniscriptKey + core::str::FromStr,
                     Pk::RawPkHash: core::str::FromStr,
@@ -190,21 +190,21 @@ macro_rules! serde_string_impl_pk {
 
                     fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
                     where
-                        E: serde::de::Error,
+                        E: $crate::serde::de::Error,
                     {
                         $name::from_str(v).map_err(E::custom)
                     }
 
                     fn visit_borrowed_str<E>(self, v: &'de str) -> Result<Self::Value, E>
                     where
-                        E: serde::de::Error,
+                        E: $crate::serde::de::Error,
                     {
                         self.visit_str(v)
                     }
 
                     fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
                     where
-                        E: serde::de::Error,
+                        E: $crate::serde::de::Error,
                     {
                         self.visit_str(&v)
                     }
@@ -215,15 +215,15 @@ macro_rules! serde_string_impl_pk {
         }
 
         #[cfg(feature = "serde")]
-        impl<'de, Pk $(, $gen)* $(, $ext)*> serde::Serialize for $name<Pk $(, $gen)* $(, $ext)*>
+        impl<'de, Pk $(, $gen)* $(, $ext)*> $crate::serde::Serialize for $name<Pk $(, $gen)* $(, $ext)*>
         where
             Pk: MiniscriptKey,
             $($gen: $gen_con,)*
             $($ext : $ext_bound,)*
         {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
-                S: serde::Serializer,
+                S: $crate::serde::Serializer,
             {
                 serializer.collect_str(&self)
             }