Merge rust-bitcoin/rust-miniscript#449: Add feature "serde"

88b1f530f79361c3d2a39b98f354642d53ec5c71 Add feature "seder" (Tobin C. Harding)

Pull request description:

  As we did in `rust-bitcoin`; change the "serde" feature to
  "actual-serde" and use `package = "serde"`. This allows users of
  miniscript to use "serde" as the feature enabling serde instead of our
  custom "use-serde".

  Fix: #438

ACKs for top commit:
  apoelstra:
    ACK 88b1f530f79361c3d2a39b98f354642d53ec5c71

Tree-SHA512: 3ea0e1d596190ebe7bc88e972f931fadfcc7ae014ad07e7153de7988ff4e66c35f1505ebd9d5e7a2b54ec973ee4c52d2c0d1b0e954feae3d02ea0d7511cb7fd1

Author: heap-coder

Cargo.toml

@@ -17,14 +17,17 @@ no-std = ["hashbrown", "bitcoin/no-std"]
 compiler = []
 trace = []
 unstable = []
-use-serde = ["serde", "bitcoin/use-serde"]
+serde = ["actual-serde", "bitcoin/use-serde"]
 rand = ["bitcoin/rand"]
 
 [dependencies]
 bitcoin = { version = "0.28.1", default-features = false }
-serde = { version = "1.0", optional = true }
 hashbrown = { version = "0.11", optional = true }
 
+# Do NOT use this as a feature! Use the `serde` feature instead.
+actual-serde = { package = "serde", version = "1.0", optional = true }
+
+
 [dev-dependencies]
 bitcoind = {version = "0.26.1", features=["22_0"]}
 actual-rand = { package = "rand", version = "0.8.4"}

contrib/test.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-FEATURES="compiler use-serde rand"
+FEATURES="compiler serde rand"
 
 # Use toolchain if explicitly specified
 if [ -n "$TOOLCHAIN" ]

src/lib.rs

@@ -108,7 +108,7 @@ extern crate hashbrown;
 extern crate core;
 
 #[cfg(feature = "serde")]
-pub use serde;
+pub use actual_serde as serde;
 #[cfg(all(test, feature = "unstable"))]
 extern crate test;