Skip to content

Commit be94e6c

Browse files
committed
Merge #572: add redundant features for cargo 1.41 bug
fe828d0 add redundant features for cargo 1.41 bug (Andrew Poelstra) Pull request description: It looks like cargo versions up to 1.45 have a bug that sometimes causes dependency resolution to fail. There is a straightforward, somewhat ugly fix, which this PR implements. In #571 we implemented this and rush-merged it into 0.24.x because (a) it was breaking our CI, (b) it was clearly harmless, even if it turn out not to be the best decision. For this PR I'd like somebody other than me and Sanket to take a look and sanity check us. If we merged this, it will also need a backport to 0.25.x. For more details see #571 and the linked issues there. ACKs for top commit: Kixunil: ACK fe828d0 Tree-SHA512: 1e771137088036ae7331d42c86955a2a8c73c22f2850d03b8a9e9b7aa21315d558cbfe6cb1f4c839fa8df15b24756bc26eda25b1214d27e719abd10af2cef5fc
2 parents ca07446 + fe828d0 commit be94e6c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ std = ["alloc", "secp256k1-sys/std"]
2323
# allow use of Secp256k1::new and related API that requires an allocator
2424
alloc = ["secp256k1-sys/alloc"]
2525
bitcoin-hashes = ["bitcoin_hashes"] # Feature alias because of the underscore.
26-
bitcoin-hashes-std = ["std", "bitcoin_hashes/std"]
27-
rand-std = ["std", "rand/std", "rand/std_rng"]
26+
bitcoin-hashes-std = ["std", "bitcoin_hashes", "bitcoin_hashes/std"]
27+
rand-std = ["std", "rand", "rand/std", "rand/std_rng"]
2828
recovery = ["secp256k1-sys/recovery"]
2929
lowmemory = ["secp256k1-sys/lowmemory"]
3030
global-context = ["std"]

0 commit comments

Comments
 (0)