diff --git a/Cargo.lock b/Cargo.lock index fe3273044..eb6db3797 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,6 +224,30 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -303,7 +327,7 @@ dependencies = [ "etcetera", "faccess", "filetime", - "globset", + "globset 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "humantime", "ignore", "jemallocator", @@ -350,6 +374,18 @@ dependencies = [ "regex", ] +[[package]] +name = "globset" +version = "0.4.13" +source = "git+https://github.com/tavianator/ripgrep?branch=fd#43c6a11033ec5a66a73a1082ea71257e527d1de9" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax 0.8.2", +] + [[package]] name = "heck" version = "0.4.1" @@ -397,16 +433,14 @@ dependencies = [ [[package]] name = "ignore" version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +source = "git+https://github.com/tavianator/ripgrep?branch=fd#43c6a11033ec5a66a73a1082ea71257e527d1de9" dependencies = [ - "globset", - "lazy_static", + "crossbeam-deque", + "globset 0.4.13 (git+https://github.com/tavianator/ripgrep?branch=fd)", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -479,6 +513,15 @@ version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "nix" version = "0.24.3" @@ -653,6 +696,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "serde" version = "1.0.189" @@ -758,16 +807,6 @@ dependencies = [ "test-case-core", ] -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "unicode-ident" version = "1.0.12" diff --git a/Cargo.toml b/Cargo.toml index 5eb578197..ab435ac62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,9 @@ crossbeam-channel = "0.5.8" clap_complete = {version = "4.4.1", optional = true} faccess = "0.2.4" +[patch.crates-io] +ignore = { git = "https://github.com/tavianator/ripgrep", branch = "fd" } + [dependencies.clap] version = "4.4.6" features = ["suggestions", "color", "wrap_help", "cargo", "derive"]