From 3f9b89275b0fce9ceaa3b113e3832d5e28f7d688 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Fri, 11 Feb 2022 12:19:07 -0800 Subject: [PATCH] Pin fd-lock version to 3.0.2 --- Cargo.lock | 81 +++++++++++------------------------------------------- Cargo.toml | 3 +- 2 files changed, 18 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ca7c10..8224e70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,6 +118,7 @@ dependencies = [ "clap", "dirs-next", "env_logger", + "fd-lock", "log", "regex", "rustyline", @@ -442,27 +443,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-code" version = "2.3.1" @@ -475,12 +455,12 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.3" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcef756dea9cf3db5ce73759cf0467330427a786b47711b8d6c97620d718ceb9" +checksum = "a16910e685088843d53132b04e0f10a571fdb193224fc589685b3ba1ce4cb03d" dependencies = [ "cfg-if", - "rustix", + "libc", "windows-sys", ] @@ -778,15 +758,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ipnet" version = "2.3.1" @@ -869,12 +840,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f5690fef754d905294c56f7ac815836f2513af966aa47f2e07ac79be07827f" - [[package]] name = "lock_api" version = "0.4.6" @@ -1273,20 +1238,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustix" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cee647393af53c750e15dcbf7781cdd2e550b246bde76e46c326e7ea3c73773" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "winapi 0.3.9", -] - [[package]] name = "rustls" version = "0.16.0" @@ -1908,9 +1859,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a" +checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -1921,33 +1872,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" +checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" [[package]] name = "windows_i686_gnu" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" +checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" [[package]] name = "windows_i686_msvc" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" +checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" [[package]] name = "windows_x86_64_gnu" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" +checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" [[package]] name = "windows_x86_64_msvc" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" +checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" [[package]] name = "winreg" diff --git a/Cargo.toml b/Cargo.toml index a71c542..2d0af24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ zeroize = { version = "<1.4.0" } # Optional dependencies rustyline = { version = "~9.0", optional = true } +fd-lock = { version = "=3.0.2", optional = true } dirs-next = { version = "2.0", optional = true } env_logger = { version = "0.7", optional = true } clap = { version = "2.33", optional = true } @@ -31,7 +32,7 @@ bdk-reserves = { version = "0.16", optional = true} [features] default = ["cli", "repl"] cli = ["bdk/key-value-db", "clap", "dirs-next", "env_logger"] -repl = ["regex", "rustyline"] +repl = ["regex", "rustyline", "fd-lock"] electrum = ["bdk/electrum"] esplora = [] esplora-ureq = ["esplora", "bdk/use-esplora-ureq"]