From d86ef3b01bf2c1b893c161313128b783184b9566 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 21 Feb 2023 08:33:51 +1100 Subject: [PATCH 1/2] Put non-optional dependency with other non-optional We have a separation between optional dependencies and non-optional dependencies, `hex_lit` snuck in to the wrong group. --- bitcoin/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index 2c4cbba2..f34cb1b4 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -38,13 +38,13 @@ bitcoin-internals = { path = "../internals" } bech32 = { version = "0.9.0", default-features = false } bitcoin_hashes = { version = "0.11.0", default-features = false } secp256k1 = { version = "0.25.0", default-features = false, features = ["bitcoin_hashes"] } +hex_lit = "0.1.1" base64 = { version = "0.13.0", optional = true } bitcoinconsensus = { version = "0.20.2-0.5.0", optional = true, default-features = false } core2 = { version = "0.3.0", default-features = false, features = ["alloc"], optional = true } # Do NOT use this as a feature! Use the `serde` feature instead. actual-serde = { package = "serde", version = "1.0.103", default-features = false, features = [ "derive", "alloc" ], optional = true } -hex_lit = "0.1.1" [dev-dependencies] serde_json = "1.0.0" From 2620f3b69ddc31c079b5ba2f2ef34c9bb796600c Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 21 Feb 2023 08:35:25 +1100 Subject: [PATCH 2/2] Put optional = true at the end In order to be uniform and make it easier to quickly see that the dependency is optional put `optional = true` as the last item in the config set. --- bitcoin/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index f34cb1b4..64ee773d 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -41,7 +41,7 @@ secp256k1 = { version = "0.25.0", default-features = false, features = ["bitcoin hex_lit = "0.1.1" base64 = { version = "0.13.0", optional = true } -bitcoinconsensus = { version = "0.20.2-0.5.0", optional = true, default-features = false } +bitcoinconsensus = { version = "0.20.2-0.5.0", default-features = false, optional = true } core2 = { version = "0.3.0", default-features = false, features = ["alloc"], optional = true } # Do NOT use this as a feature! Use the `serde` feature instead. actual-serde = { package = "serde", version = "1.0.103", default-features = false, features = [ "derive", "alloc" ], optional = true }