diff --git a/Cargo.lock b/Cargo.lock index cfda768b0..05a7d1e64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -733,6 +733,15 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "enumflags2" version = "0.7.7" @@ -966,9 +975,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.48.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e74cea676de7f53a79f3c0365812b11f6814b81e671b8ee4abae6ca09c7881" +checksum = "3eb22530188fa1a6921b9f1aed3183357936e450ed060d65e578b46cd1c66a33" dependencies = [ "gix-actor", "gix-attributes", @@ -978,8 +987,9 @@ dependencies = [ "gix-date", "gix-diff", "gix-discover", - "gix-features", - "gix-fs", + "gix-features 0.32.0", + "gix-filter", + "gix-fs 0.4.0", "gix-glob", "gix-hash", "gix-hashtable", @@ -1014,9 +1024,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1969b77b9ee4cc1755c841987ec6f7622aaca95e952bcafb76973ae59d1b8716" +checksum = "1b2ec47eabd8edbb375e1c5cf11a2673805ae2ee02f797923fcefc3106d39f3b" dependencies = [ "bstr", "btoi", @@ -1028,9 +1038,9 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3772b0129dcd1fc73e985bbd08a1482d082097d2915cb1ee31ce8092b8e4434" +checksum = "f97977acd02cb3369833a428b38d74960fa90dc6f58312e54e9388f293b0d93b" dependencies = [ "bstr", "gix-glob", @@ -1063,22 +1073,22 @@ dependencies = [ [[package]] name = "gix-command" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb" +checksum = "378d6a93c87616a58f2c5b40ed0ca554255ba4ce3aa35cf1d597b270d06756a7" dependencies = [ "bstr", ] [[package]] name = "gix-commitgraph" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed42baa50075d41c1a0931074ce1a97c5797c7c6fe7591d9f1f2dcd448532c26" +checksum = "c9792d974e0a54e4655b676058e0b84a76e380fa82405f296734c1f943c5c8a5" dependencies = [ "bstr", "gix-chunk", - "gix-features", + "gix-features 0.32.0", "gix-hash", "memmap2", "thiserror", @@ -1086,13 +1096,13 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817688c7005a716d9363e267913526adea402dabd947f4ba63842d10cc5132af" +checksum = "cfc134ddb07881832e50620f4b3dc0e5cb6734b80509d582a0c2bd31869f8f7f" dependencies = [ "bstr", "gix-config-value", - "gix-features", + "gix-features 0.32.0", "gix-glob", "gix-path", "gix-ref", @@ -1108,9 +1118,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d" +checksum = "731170f6ada8932ddd990548f98354cc1d027509caddfdf0c8e2c0c5e94d7d1b" dependencies = [ "bitflags 2.3.3", "bstr", @@ -1121,9 +1131,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a75565e0e6e7f80cfa4eb1b05cc448c6846ddd48dcf413a28875fbc11ee9af" +checksum = "0696fcd658b6526beff1c2716d3c94466eb2dbfaf1ecf8d961883884b687ce6d" dependencies = [ "bstr", "gix-command", @@ -1149,9 +1159,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf5d9b9b521b284ebe53ee69eee33341835ec70edc314f36b2100ea81396121" +checksum = "accf7bfad64777ab5297bd918431f359fb39eb1d519743c2059ba5af7a513229" dependencies = [ "gix-hash", "gix-object", @@ -1161,9 +1171,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272aad20dc63dedba76615373dd8885fb5aebe4795e5b5b0aa2a24e63c82085c" +checksum = "78ddcd031c607da6acb52f6c8e3c0a50cc444ed03d444d22c6a2a772ea70a051" dependencies = [ "bstr", "dunce", @@ -1179,6 +1189,17 @@ name = "gix-features" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595" +dependencies = [ + "gix-hash", + "gix-trace", + "libc", +] + +[[package]] +name = "gix-features" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f708dc9875d1b3e05c1cbadfd22e5b543c733c511191798587ec479115664221" dependencies = [ "crc32fast", "crossbeam-channel", @@ -1196,24 +1217,53 @@ dependencies = [ "walkdir", ] +[[package]] +name = "gix-filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c9b3fc103a4976e4991ad949a9929fe6da5499e9f788b7f207471ec21763c7" +dependencies = [ + "bstr", + "encoding_rs", + "gix-attributes", + "gix-command", + "gix-hash", + "gix-object", + "gix-packetline-blocking", + "gix-path", + "gix-quote", + "gix-trace", + "smallvec", + "thiserror", +] + [[package]] name = "gix-fs" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496" dependencies = [ - "gix-features", + "gix-features 0.31.1", +] + +[[package]] +name = "gix-fs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ca81d3888c5b0ac908cbe6ee975451b117b475324987f8aecf42bc5d9e4279" +dependencies = [ + "gix-features 0.32.0", ] [[package]] name = "gix-glob" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a" +checksum = "b1ddc03b04f2ef410e156c90d05080651e06f617a2d083030a5daff5e6fe0b88" dependencies = [ "bitflags 2.3.3", "bstr", - "gix-features", + "gix-features 0.32.0", "gix-path", ] @@ -1240,9 +1290,9 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca801f2d0535210f77b33e2c067d565aedecacc82f1b3dbce26da1388ebc4634" +checksum = "65ffd8e8860fd2eff53038101828fe8d19e5aad9dc869d9f1fbea825cf2830cf" dependencies = [ "bstr", "gix-glob", @@ -1252,16 +1302,16 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562" +checksum = "e447ecb5c8365cdd1d8fe55d6cb047279657ef1747c4347755a4b64ff3b2f0d6" dependencies = [ "bitflags 2.3.3", "bstr", "btoi", "filetime", "gix-bitmap", - "gix-features", + "gix-features 0.32.0", "gix-hash", "gix-lock", "gix-object", @@ -1285,9 +1335,9 @@ dependencies = [ [[package]] name = "gix-mailmap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1787e3c37fc43b1f7c0e3be6196c6837b3ba5f869190dfeaa444b816f0a7f34b" +checksum = "fe5a913fd8f56ea21cbd3b8bf813e0b410771682a065a14a4e9dede1012cd532" dependencies = [ "bstr", "gix-actor", @@ -1297,9 +1347,9 @@ dependencies = [ [[package]] name = "gix-negotiate" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2" +checksum = "945302d90a0519a31acc42e7584d1e08156ef59b179e3bbf1fd9c0e40d819e64" dependencies = [ "bitflags 2.3.3", "gix-commitgraph", @@ -1313,15 +1363,15 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953f3d7ffad16734aa3ab1d05807972c80e339d1bd9dde03e0198716b99e2a6" +checksum = "bf32d43ccbeb9f2f54a74ee0a4b6a37143b0ba18a22288f4b790869cce232c46" dependencies = [ "bstr", "btoi", "gix-actor", "gix-date", - "gix-features", + "gix-features 0.32.0", "gix-hash", "gix-validate", "hex", @@ -1333,13 +1383,13 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.49.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6418cff00ecc2713b58c8e04bff30dda808fbba1a080e7248b299d069894a01" +checksum = "892c87273faa345ea12438c4ce2b89be15ae4abfda383035b8a3950965327d97" dependencies = [ "arc-swap", "gix-date", - "gix-features", + "gix-features 0.32.0", "gix-hash", "gix-object", "gix-pack", @@ -1352,14 +1402,14 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414935138d90043ea5898de7a93f02c2558e52652492719470e203ef26a8fd0a" +checksum = "3163c2bdbb1ec45a717b5bbab69d715b2a5711c19f91f9a3045c6f805cc59c83" dependencies = [ "clru", "gix-chunk", "gix-diff", - "gix-features", + "gix-features 0.32.0", "gix-hash", "gix-hashtable", "gix-object", @@ -1373,6 +1423,17 @@ dependencies = [ "uluru", ] +[[package]] +name = "gix-packetline-blocking" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef45b51fba629b588c3c50b57c815edebd5dddf7daa33736c33f160f9a64f34" +dependencies = [ + "bstr", + "hex", + "thiserror", +] + [[package]] name = "gix-path" version = "0.8.3" @@ -1388,14 +1449,14 @@ dependencies = [ [[package]] name = "gix-prompt" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec" +checksum = "abe84674ac2473f98dea1832f727ddb16acbff3262dbf226f0a9be188b9a922b" dependencies = [ "gix-command", "gix-config-value", "parking_lot", - "rustix 0.37.21", + "rustix 0.38.4", "thiserror", ] @@ -1412,14 +1473,14 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39453f4e5f23cddc2e6e4cca2ba20adfdbec29379e3ca829714dfe98ae068ccd" +checksum = "e368f5368279e97148a6214ec534bfebd1f29a0fe344947d92f488397bb27a08" dependencies = [ "gix-actor", "gix-date", - "gix-features", - "gix-fs", + "gix-features 0.32.0", + "gix-fs 0.4.0", "gix-hash", "gix-lock", "gix-object", @@ -1433,9 +1494,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e76ff1f82fba295a121e31ab02f69642994e532c45c0c899aa393f4b740302" +checksum = "df521f8fc9cbd82d9abb01b8047b653de1e58c9b4b919d63218d7da2a9cd91d7" dependencies = [ "bstr", "gix-hash", @@ -1447,9 +1508,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237428a7d3978e8572964e1e45d984027c2acc94df47e594baa6c4b0da7c9922" +checksum = "1503e94badcbb9d8dc6ea3063522798913ead8f37f564f2cc335eff572208178" dependencies = [ "bstr", "gix-date", @@ -1462,9 +1523,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028d50fcaf8326a8f79a359490d9ca9fb4e2b51ac9ac86503560d0bcc888d2eb" +checksum = "3f43049c861d0de876d9022f61fddca4081f17c51d4dc5f7541621a076cb3218" dependencies = [ "gix-commitgraph", "gix-date", @@ -1493,7 +1554,7 @@ version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2" dependencies = [ - "gix-fs", + "gix-fs 0.3.0", "libc", "once_cell", "parking_lot", @@ -1510,9 +1571,9 @@ checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663" [[package]] name = "gix-traverse" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3cdfd54598db4fae57d5ae6f52958422b2d13382d2745796bfe5c8015ffa86e" +checksum = "be19057a9ddef95af02d32b8b8d953cf974c4d378918e5e97d7345b843e0c271" dependencies = [ "gix-commitgraph", "gix-date", @@ -1526,12 +1587,12 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beaede6dbc83f408b19adfd95bb52f1dbf01fb8862c3faf6c6243e2e67fcdfa1" +checksum = "092d3f8f4040ee1b82830224e9002fff69248348af27dfdbcc8536db80283945" dependencies = [ "bstr", - "gix-features", + "gix-features 0.32.0", "gix-path", "home", "thiserror", @@ -1559,15 +1620,16 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1363b9aa66b9e14412ac04e1f759827203f491729d92172535a8ce6cde02efa" +checksum = "07b773e8e249c13fce5757b15e2620078adfec9dcfbfc7d243fbabf5bb49f121" dependencies = [ "bstr", "filetime", "gix-attributes", - "gix-features", - "gix-fs", + "gix-features 0.32.0", + "gix-filter", + "gix-fs 0.4.0", "gix-glob", "gix-hash", "gix-ignore", @@ -1745,7 +1807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi", - "rustix 0.38.1", + "rustix 0.38.4", "windows-sys", ] @@ -2606,9 +2668,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.1" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.3.3", "errno 0.3.1", @@ -2899,7 +2961,7 @@ dependencies = [ "dunce", "gethostname", "gix", - "gix-features", + "gix-features 0.32.0", "guess_host_triple", "home", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 371c94512..c6c65e62d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,8 +49,8 @@ dirs-next = "2.0.0" dunce = "1.0.4" gethostname = "0.4.3" # default feature restriction addresses https://github.com/starship/starship/issues/4251 -gix = { version = "0.48.0", default-features = false, features = ["max-performance-safe"] } -gix-features = { version = "0.31.1", optional = true } +gix = { version = "0.49.1", default-features = false, features = ["max-performance-safe"] } +gix-features = { version = "0.32.0", optional = true } indexmap = { version = "1.9.3", features = ["serde"] } log = { version = "0.4.19", features = ["std"] } # notify-rust is optional (on by default) because the crate doesn't currently build for darwin with nix