diff --git a/Cargo.lock b/Cargo.lock index 621a59091a..31879866de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,15 +13,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.1.2" @@ -37,7 +28,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472" dependencies = [ - "bstr", + "bstr 0.2.17", "doc-comment", "predicates", "predicates-core", @@ -80,11 +71,21 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "lazy_static 1.4.0", + "lazy_static", "memchr", "regex-automata 0.1.10", ] +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" version = "3.11.1" @@ -122,7 +123,7 @@ dependencies = [ "bitflags 1.3.2", "clap_lex", "indexmap", - "lazy_static 1.4.0", + "lazy_static", "strsim", "termcolor", "terminal_size", @@ -158,12 +159,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "crossbeam" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be" - [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -194,7 +189,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static 1.4.0", + "lazy_static", "memoffset", "scopeguard", ] @@ -206,7 +201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if", - "lazy_static 1.4.0", + "lazy_static", ] [[package]] @@ -272,11 +267,11 @@ dependencies = [ "ignore", "is-terminal", "itertools 0.11.0", - "lazy_static 1.4.0", + "lazy_static", "libc", "libmimalloc-sys", "line-numbers", - "log 0.4.17", + "log", "memchr", "mimalloc", "owo-colors", @@ -285,7 +280,7 @@ dependencies = [ "pretty_env_logger", "radix-heap", "rayon", - "regex 1.9.4", + "regex", "rustc-hash", "serde", "serde_json", @@ -319,8 +314,8 @@ checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "humantime", "is-terminal", - "log 0.4.17", - "regex 1.9.4", + "log", + "regex", "termcolor", ] @@ -374,15 +369,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.2.1" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464627f948c3190ae3d04b1bc6d7dca2f785bda0ac01278e6db129ad383dbeb6" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.6.10", + "aho-corasick", + "bstr 1.6.0", "fnv", - "log 0.3.9", - "memchr", - "regex 0.2.11", + "log", + "regex", ] [[package]] @@ -438,19 +433,20 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "ignore" -version = "0.3.1" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f0238094bd1b41800fb6eb9b16fdd5e9832ed6053ed91409f0cd5bf28dcfd" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "crossbeam", + "crossbeam-utils", "globset", - "lazy_static 0.2.11", - "log 0.3.9", + "lazy_static", + "log", "memchr", - "regex 0.2.11", + "regex", "same-file", "thread_local", "walkdir", + "winapi-util", ] [[package]] @@ -510,12 +506,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - [[package]] name = "lazy_static" version = "1.4.0" @@ -565,15 +555,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - [[package]] name = "log" version = "0.4.17" @@ -620,7 +601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", - "log 0.4.17", + "log", "wasi", "windows-sys 0.42.0", ] @@ -731,7 +712,7 @@ dependencies = [ "itertools 0.10.3", "normalize-line-endings", "predicates-core", - "regex 1.9.4", + "regex", ] [[package]] @@ -769,7 +750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ "env_logger", - "log 0.4.17", + "log", ] [[package]] @@ -827,29 +808,16 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - [[package]] name = "regex" version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] @@ -864,18 +832,9 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", + "regex-syntax", ] [[package]] @@ -1084,11 +1043,12 @@ dependencies = [ [[package]] name = "thread_local" -version = "0.3.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "lazy_static 1.4.0", + "cfg-if", + "once_cell", ] [[package]] @@ -1098,7 +1058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc" dependencies = [ "cc", - "regex 1.9.4", + "regex", ] [[package]] @@ -1108,7 +1068,7 @@ source = "git+https://github.com/Wilfred/tree_magic?branch=fix-panic-for-empty-s dependencies = [ "bytecount", "fnv", - "lazy_static 1.4.0", + "lazy_static", "nom", "once_cell", "petgraph", @@ -1120,12 +1080,6 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" -[[package]] -name = "ucd-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" - [[package]] name = "unicode-ident" version = "1.0.0" @@ -1144,12 +1098,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 6670a2dd11..5564c061fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,8 @@ mimalloc = { version = "0.1.28", default-features = false } # large textual files, as discussed in #297. libmimalloc-sys = "=0.1.24" radix-heap = "0.4.2" -ignore = "0.3.1" +# ignore 0.4.19 requires scoped_threads, which was added in rust 1.63. +ignore = ">= 0.4, < 0.4.19" const_format = "0.2.22" owo-colors = "3.5.0" wu-diff = "0.1.2"