Skip to content

Commit 27bc329

Browse files
committed
Merge #449: Add feature "serde"
88b1f53 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 88b1f53 Tree-SHA512: 3ea0e1d596190ebe7bc88e972f931fadfcc7ae014ad07e7153de7988ff4e66c35f1505ebd9d5e7a2b54ec973ee4c52d2c0d1b0e954feae3d02ea0d7511cb7fd1
2 parents c7c39f1 + 88b1f53 commit 27bc329

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Cargo.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@ no-std = ["hashbrown", "bitcoin/no-std"]
1717
compiler = []
1818
trace = []
1919
unstable = []
20-
use-serde = ["serde", "bitcoin/use-serde"]
20+
serde = ["actual-serde", "bitcoin/use-serde"]
2121
rand = ["bitcoin/rand"]
2222

2323
[dependencies]
2424
bitcoin = { version = "0.28.1", default-features = false }
25-
serde = { version = "1.0", optional = true }
2625
hashbrown = { version = "0.11", optional = true }
2726

27+
# Do NOT use this as a feature! Use the `serde` feature instead.
28+
actual-serde = { package = "serde", version = "1.0", optional = true }
29+
30+
2831
[dev-dependencies]
2932
bitcoind = {version = "0.26.1", features=["22_0"]}
3033
actual-rand = { package = "rand", version = "0.8.4"}

contrib/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
FEATURES="compiler use-serde rand"
5+
FEATURES="compiler serde rand"
66

77
# Use toolchain if explicitly specified
88
if [ -n "$TOOLCHAIN" ]

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extern crate hashbrown;
108108
extern crate core;
109109

110110
#[cfg(feature = "serde")]
111-
pub use serde;
111+
pub use actual_serde as serde;
112112
#[cfg(all(test, feature = "unstable"))]
113113
extern crate test;
114114

0 commit comments

Comments
 (0)