diff --git a/Cargo.lock b/Cargo.lock index fa36091ec..e2bf30b12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,17 +158,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.31", -] - [[package]] name = "atty" version = "0.2.14" @@ -320,7 +309,7 @@ dependencies = [ "clap-cargo", "clap-verbosity-flag", "directories", - "gix 0.52.0", + "gix 0.53.1", "handlebars", "human-panic", "ignore", @@ -586,12 +575,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - [[package]] name = "deranged" version = "0.3.8" @@ -668,18 +651,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-as-inner" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -869,58 +840,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "gix" -version = "0.50.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "275b1bfa0d6f6ed31a2e2e878a4539f4994eac8840546283ab3aebbd8fcaa42d" -dependencies = [ - "gix-actor 0.24.2", - "gix-attributes 0.16.0", - "gix-commitgraph 0.18.2", - "gix-config 0.26.2", - "gix-credentials 0.17.1", - "gix-date", - "gix-diff 0.33.1", - "gix-discover 0.22.1", - "gix-features 0.32.1", - "gix-filter 0.2.0", - "gix-fs 0.4.1", - "gix-glob 0.10.2", - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-ignore 0.5.1", - "gix-index 0.21.1", - "gix-lock 7.0.2", - "gix-mailmap 0.16.1", - "gix-negotiate 0.5.1", - "gix-object 0.33.2", - "gix-odb 0.50.2", - "gix-pack 0.40.2", - "gix-path 0.8.4", - "gix-prompt 0.5.5", - "gix-protocol", - "gix-ref 0.33.3", - "gix-refspec 0.14.1", - "gix-revision 0.18.1", - "gix-sec 0.8.4", - "gix-tempfile 7.0.2", - "gix-trace", - "gix-transport", - "gix-traverse 0.30.1", - "gix-url 0.21.1", - "gix-utils", - "gix-validate 0.7.7", - "gix-worktree 0.23.1", - "log", - "once_cell", - "reqwest", - "signal-hook", - "smallvec", - "thiserror", - "unicode-normalization", -] - [[package]] name = "gix" version = "0.52.0" @@ -928,30 +847,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a35ed1401a11506b45361746507a7c94c546574ddd7dfc2717f8941e30070254" dependencies = [ "gix-actor 0.25.0", - "gix-attributes 0.17.0", + "gix-attributes", "gix-commitgraph 0.19.0", "gix-config 0.28.0", - "gix-credentials 0.18.0", - "gix-date", + "gix-credentials", + "gix-date 0.7.4", "gix-diff 0.34.0", "gix-discover 0.23.0", "gix-features 0.33.0", - "gix-filter 0.3.0", + "gix-filter", "gix-fs 0.5.0", "gix-glob 0.11.0", "gix-hash 0.12.0", "gix-hashtable 0.3.0", - "gix-ignore 0.6.0", + "gix-ignore", "gix-index 0.22.0", "gix-lock 8.0.0", - "gix-mailmap 0.17.0", - "gix-negotiate 0.6.0", + "gix-mailmap", + "gix-negotiate", "gix-object 0.35.0", "gix-odb 0.51.0", "gix-pack 0.41.0", "gix-path 0.9.0", "gix-pathspec", - "gix-prompt 0.6.0", + "gix-prompt", + "gix-protocol", "gix-ref 0.35.0", "gix-refspec 0.16.0", "gix-revision 0.20.0", @@ -959,15 +879,17 @@ dependencies = [ "gix-submodule", "gix-tempfile 8.0.0", "gix-trace", + "gix-transport", "gix-traverse 0.31.0", "gix-url 0.22.0", "gix-utils", - "gix-validate 0.8.0", - "gix-worktree 0.24.0", + "gix-validate", + "gix-worktree", "gix-worktree-state", "log", "once_cell", "parking_lot", + "reqwest", "signal-hook", "smallvec", "thiserror", @@ -975,17 +897,45 @@ dependencies = [ ] [[package]] -name = "gix-actor" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd2566c12095a584716f2c16f051850bd8987f57556f1fef4a7cce0300b83d0" -dependencies = [ - "bstr 1.6.2", - "btoi", - "gix-date", - "itoa", - "nom", +name = "gix" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06a8c9f9452078f474fecd2880de84819b8c77224ab62273275b646bf785f906" +dependencies = [ + "gix-actor 0.26.0", + "gix-commitgraph 0.20.0", + "gix-config 0.29.0", + "gix-date 0.8.0", + "gix-diff 0.35.0", + "gix-discover 0.24.0", + "gix-features 0.34.0", + "gix-fs 0.6.0", + "gix-glob 0.12.0", + "gix-hash 0.13.0", + "gix-hashtable 0.4.0", + "gix-index 0.24.0", + "gix-lock 9.0.0", + "gix-macros", + "gix-object 0.36.0", + "gix-odb 0.52.0", + "gix-pack 0.42.0", + "gix-path 0.10.0", + "gix-ref 0.36.0", + "gix-refspec 0.17.0", + "gix-revision 0.21.0", + "gix-revwalk 0.7.0", + "gix-sec 0.10.0", + "gix-tempfile 9.0.0", + "gix-trace", + "gix-traverse 0.32.0", + "gix-url 0.23.0", + "gix-utils", + "gix-validate", + "once_cell", + "parking_lot", + "smallvec", "thiserror", + "unicode-normalization", ] [[package]] @@ -996,27 +946,24 @@ checksum = "8f8a773b5385e9d2f88bd879fb763ec1212585f6d630ebe13adb7bac93bce975" dependencies = [ "bstr 1.6.2", "btoi", - "gix-date", + "gix-date 0.7.4", "itoa", "thiserror", "winnow", ] [[package]] -name = "gix-attributes" -version = "0.16.0" +name = "gix-actor" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a134a674e39e238bd273326a9815296cc71f867ad5466518da71392cff98ce" +checksum = "8e8c6778cc03bca978b2575a03e04e5ba6f430a9dd9b0f1259f0a8a9a5e5cc66" dependencies = [ "bstr 1.6.2", - "gix-glob 0.10.2", - "gix-path 0.8.4", - "gix-quote", - "kstring", - "log", - "smallvec", + "btoi", + "gix-date 0.8.0", + "itoa", "thiserror", - "unicode-bom", + "winnow", ] [[package]] @@ -1063,20 +1010,6 @@ dependencies = [ "bstr 1.6.2", ] -[[package]] -name = "gix-commitgraph" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8219fe6f39588a29dbfb8d1c244b07ee653126edc5b6f3860752c3b5454fa10b" -dependencies = [ - "bstr 1.6.2", - "gix-chunk", - "gix-features 0.32.1", - "gix-hash 0.11.4", - "memmap2", - "thiserror", -] - [[package]] name = "gix-commitgraph" version = "0.19.0" @@ -1092,25 +1025,17 @@ dependencies = [ ] [[package]] -name = "gix-config" -version = "0.26.2" +name = "gix-commitgraph" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2135b921a699a4c36167148193bea23c653a16ef0686f6a280e383469709a773" +checksum = "4676ede3a7d37e7028e2889830349a6aca22efc1d2f2dd9fa3351c1a8ddb0c6a" dependencies = [ "bstr 1.6.2", - "gix-config-value 0.12.5", - "gix-features 0.32.1", - "gix-glob 0.10.2", - "gix-path 0.8.4", - "gix-ref 0.33.3", - "gix-sec 0.8.4", - "log", - "memchr", - "once_cell", - "smallvec", + "gix-chunk", + "gix-features 0.34.0", + "gix-hash 0.13.0", + "memmap2", "thiserror", - "unicode-bom", - "winnow", ] [[package]] @@ -1136,16 +1061,24 @@ dependencies = [ ] [[package]] -name = "gix-config-value" -version = "0.12.5" +name = "gix-config" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897" +checksum = "1108c4ac88248dd25cc8ab0d0dae796e619fb72d92f88e30e00b29d61bb93cc4" dependencies = [ - "bitflags 2.4.0", "bstr 1.6.2", - "gix-path 0.8.4", - "libc", + "gix-config-value 0.14.0", + "gix-features 0.34.0", + "gix-glob 0.12.0", + "gix-path 0.10.0", + "gix-ref 0.36.0", + "gix-sec 0.10.0", + "memchr", + "once_cell", + "smallvec", "thiserror", + "unicode-bom", + "winnow", ] [[package]] @@ -1162,18 +1095,15 @@ dependencies = [ ] [[package]] -name = "gix-credentials" -version = "0.17.1" +name = "gix-config-value" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307d91ec5f7c8e9bfaa217fe30c2e0099101cbe83dbed27a222dbb6def38725f" +checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ + "bitflags 2.4.0", "bstr 1.6.2", - "gix-command", - "gix-config-value 0.12.5", - "gix-path 0.8.4", - "gix-prompt 0.5.5", - "gix-sec 0.8.4", - "gix-url 0.21.1", + "gix-path 0.10.0", + "libc", "thiserror", ] @@ -1187,7 +1117,7 @@ dependencies = [ "gix-command", "gix-config-value 0.13.0", "gix-path 0.9.0", - "gix-prompt 0.6.0", + "gix-prompt", "gix-sec 0.9.0", "gix-url 0.22.0", "thiserror", @@ -1206,15 +1136,15 @@ dependencies = [ ] [[package]] -name = "gix-diff" -version = "0.33.1" +name = "gix-date" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49d7a9a9ed5ec3428c3061da45d0fc5f50b3c07b91ea4e7ec4959668f25f6c" +checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" dependencies = [ - "gix-hash 0.11.4", - "gix-object 0.33.2", - "imara-diff", + "bstr 1.6.2", + "itoa", "thiserror", + "time", ] [[package]] @@ -1230,17 +1160,13 @@ dependencies = [ ] [[package]] -name = "gix-discover" -version = "0.22.1" +name = "gix-diff" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "041480eb03d8aa0894d9b73d25d182d51bc4d0ea8925a6ee0c971262bbc7715e" +checksum = "b45e342d148373bd9070d557e6fb1280aeae29a3e05e32506682d027278501eb" dependencies = [ - "bstr 1.6.2", - "dunce", - "gix-hash 0.11.4", - "gix-path 0.8.4", - "gix-ref 0.33.3", - "gix-sec 0.8.4", + "gix-hash 0.13.0", + "gix-object 0.36.0", "thiserror", ] @@ -1259,23 +1185,38 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-discover" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4cacda5ee9dd1b38b0e2506834e40e66c08cf050ef55c344334c76745f277b" +dependencies = [ + "bstr 1.6.2", + "dunce", + "gix-hash 0.13.0", + "gix-path 0.10.0", + "gix-ref 0.36.0", + "gix-sec 0.10.0", + "thiserror", +] + [[package]] name = "gix-features" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882695cccf38da4c3cc7ee687bdb412cf25e37932d7f8f2c306112ea712449f1" +checksum = "7f77decb545f63a52852578ef5f66ecd71017ffc1983d551d5fa2328d6d9817f" dependencies = [ "bytes", "crc32fast", "crossbeam-channel", "flate2", - "gix-hash 0.11.4", + "gix-hash 0.12.0", "gix-trace", "jwalk", "libc", "once_cell", "parking_lot", - "prodash", + "prodash 25.0.2", "sha1_smol", "thiserror", "walkdir", @@ -1283,46 +1224,26 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f77decb545f63a52852578ef5f66ecd71017ffc1983d551d5fa2328d6d9817f" +checksum = "f414c99e1a7abc69b21f3225a6539d203b0513f1d1d448607c4ea81cdcf9ee59" dependencies = [ "crc32fast", "crossbeam-channel", "flate2", - "gix-hash 0.12.0", + "gix-hash 0.13.0", "gix-trace", "jwalk", "libc", "once_cell", "parking_lot", - "prodash", + "prodash 26.2.1", "sha1", "sha1_smol", "thiserror", "walkdir", ] -[[package]] -name = "gix-filter" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4d4d61f2ab07de4612f8e078d7f1a443c7ab5c40f382784c8eacdf0fd172b9" -dependencies = [ - "bstr 1.6.2", - "encoding_rs", - "gix-attributes 0.16.0", - "gix-command", - "gix-hash 0.11.4", - "gix-object 0.33.2", - "gix-packetline-blocking", - "gix-path 0.8.4", - "gix-quote", - "gix-trace", - "smallvec", - "thiserror", -] - [[package]] name = "gix-filter" version = "0.3.0" @@ -1331,7 +1252,7 @@ checksum = "5f5495cdd54f4c3bb05b35a525cd39df1643362d917a7e03f112564c2825feb4" dependencies = [ "bstr 1.6.2", "encoding_rs", - "gix-attributes 0.17.0", + "gix-attributes", "gix-command", "gix-hash 0.12.0", "gix-object 0.35.0", @@ -1343,15 +1264,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-fs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5b6e9d34a2c61ea4a02bbca94c409ab6dbbca1348cbb67298cd7fed8758761" -dependencies = [ - "gix-features 0.32.1", -] - [[package]] name = "gix-fs" version = "0.5.0" @@ -1362,15 +1274,12 @@ dependencies = [ ] [[package]] -name = "gix-glob" -version = "0.10.2" +name = "gix-fs" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7255c717f49a556fa5029f6d9f2b3c008b4dd016c87f23c2ab8ca9636d5fade" +checksum = "404795da3d4c660c9ab6c3b2ad76d459636d1e1e4b37b0c7ff68eee898c298d4" dependencies = [ - "bitflags 2.4.0", - "bstr 1.6.2", - "gix-features 0.32.1", - "gix-path 0.8.4", + "gix-features 0.34.0", ] [[package]] @@ -1386,13 +1295,15 @@ dependencies = [ ] [[package]] -name = "gix-hash" -version = "0.11.4" +name = "gix-glob" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" +checksum = "e3ac79c444193b0660fe0c0925d338bd338bd643e32138784dccfb12c628b892" dependencies = [ - "hex", - "thiserror", + "bitflags 2.4.0", + "bstr 1.6.2", + "gix-features 0.34.0", + "gix-path 0.10.0", ] [[package]] @@ -1406,14 +1317,13 @@ dependencies = [ ] [[package]] -name = "gix-hashtable" -version = "0.2.4" +name = "gix-hash" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d" +checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" dependencies = [ - "gix-hash 0.11.4", - "hashbrown 0.14.0", - "parking_lot", + "faster-hex", + "thiserror", ] [[package]] @@ -1428,15 +1338,14 @@ dependencies = [ ] [[package]] -name = "gix-ignore" -version = "0.5.1" +name = "gix-hashtable" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88b95ceb3bc45abcab6eb55ef4e0053e58b4df0712d3f9aec7d0ca990952603" +checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ - "bstr 1.6.2", - "gix-glob 0.10.2", - "gix-path 0.8.4", - "unicode-bom", + "gix-hash 0.13.0", + "hashbrown 0.14.0", + "parking_lot", ] [[package]] @@ -1453,21 +1362,21 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732f61ec71576bd443a3c24f4716dc7eac180d8929e7bb8603c7310161507106" +checksum = "a9738fc58ca30e232c7b1be8e8ab52b072979acb9bf3fa97662b5b23c0c6fbca" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", "btoi", "filetime", "gix-bitmap", - "gix-features 0.32.1", - "gix-fs 0.4.1", - "gix-hash 0.11.4", - "gix-lock 7.0.2", - "gix-object 0.33.2", - "gix-traverse 0.30.1", + "gix-features 0.33.0", + "gix-fs 0.5.0", + "gix-hash 0.12.0", + "gix-lock 8.0.0", + "gix-object 0.35.0", + "gix-traverse 0.31.0", "itoa", "memmap2", "smallvec", @@ -1476,21 +1385,21 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9738fc58ca30e232c7b1be8e8ab52b072979acb9bf3fa97662b5b23c0c6fbca" +checksum = "0e9599fc30b3d6aad231687a403f85dfa36ae37ccf1b68ee1f621ad5b7fc7a0d" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", "btoi", "filetime", "gix-bitmap", - "gix-features 0.33.0", - "gix-fs 0.5.0", - "gix-hash 0.12.0", - "gix-lock 8.0.0", - "gix-object 0.35.0", - "gix-traverse 0.31.0", + "gix-features 0.34.0", + "gix-fs 0.6.0", + "gix-hash 0.13.0", + "gix-lock 9.0.0", + "gix-object 0.36.0", + "gix-traverse 0.32.0", "itoa", "memmap2", "smallvec", @@ -1499,36 +1408,35 @@ dependencies = [ [[package]] name = "gix-lock" -version = "7.0.2" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e82ec23c8a281f91044bf3ed126063b91b59f9c9340bf0ae746f385cc85a6fa" +checksum = "de4363023577b31906b476b34eefbf76931363ec574f88b5c7b6027789f1e3ce" dependencies = [ - "gix-tempfile 7.0.2", + "gix-tempfile 8.0.0", "gix-utils", "thiserror", ] [[package]] name = "gix-lock" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4363023577b31906b476b34eefbf76931363ec574f88b5c7b6027789f1e3ce" +checksum = "1568c3d90594c60d52670f325f5db88c2d572e85c8dd45fabc23d91cadb0fd52" dependencies = [ - "gix-tempfile 8.0.0", + "gix-tempfile 9.0.0", "gix-utils", "thiserror", ] [[package]] -name = "gix-mailmap" -version = "0.16.1" +name = "gix-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc0dbbf35d29639770af68d7ff55924d83786c8924b0e6a1766af1a98b7d58b" +checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" dependencies = [ - "bstr 1.6.2", - "gix-actor 0.24.2", - "gix-date", - "thiserror", + "proc-macro2", + "quote", + "syn 2.0.31", ] [[package]] @@ -1539,23 +1447,7 @@ checksum = "244a4a6f08e8104110675de649ccd20fe1d1116783063920e19aa7da197a4ad0" dependencies = [ "bstr 1.6.2", "gix-actor 0.25.0", - "gix-date", - "thiserror", -] - -[[package]] -name = "gix-negotiate" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0061b7ae867e830c77b1ecfc5875f0d042aebb3d7e6014d04fd86ca6c71d59" -dependencies = [ - "bitflags 2.4.0", - "gix-commitgraph 0.18.2", - "gix-date", - "gix-hash 0.11.4", - "gix-object 0.33.2", - "gix-revwalk 0.4.1", - "smallvec", + "gix-date 0.7.4", "thiserror", ] @@ -1567,7 +1459,7 @@ checksum = "a0b0ea711559f843b8286cdf71ea421560c072120fae35a949bcf6b068b73745" dependencies = [ "bitflags 2.4.0", "gix-commitgraph 0.19.0", - "gix-date", + "gix-date 0.7.4", "gix-hash 0.12.0", "gix-object 0.35.0", "gix-revwalk 0.6.0", @@ -1575,26 +1467,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-object" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdd87520c71a19afecfa616863a4b761621074878f5a3999243b3e37e233943" -dependencies = [ - "bstr 1.6.2", - "btoi", - "gix-actor 0.24.2", - "gix-date", - "gix-features 0.32.1", - "gix-hash 0.11.4", - "gix-validate 0.7.7", - "hex", - "itoa", - "nom", - "smallvec", - "thiserror", -] - [[package]] name = "gix-object" version = "0.35.0" @@ -1604,10 +1476,10 @@ dependencies = [ "bstr 1.6.2", "btoi", "gix-actor 0.25.0", - "gix-date", + "gix-date 0.7.4", "gix-features 0.33.0", "gix-hash 0.12.0", - "gix-validate 0.8.0", + "gix-validate", "itoa", "smallvec", "thiserror", @@ -1615,22 +1487,22 @@ dependencies = [ ] [[package]] -name = "gix-odb" -version = "0.50.2" +name = "gix-object" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e827dbda6d3dabadb94cd437d0e0fe8c314a60d136a3235fc6f5bf7b96b976ac" +checksum = "3e5528d5b2c984044d547e696e44a8c45fa122e83cd8c2ac1da69bd474336be8" dependencies = [ - "arc-swap", - "gix-date", - "gix-features 0.32.1", - "gix-hash 0.11.4", - "gix-object 0.33.2", - "gix-pack 0.40.2", - "gix-path 0.8.4", - "gix-quote", - "parking_lot", - "tempfile", + "bstr 1.6.2", + "btoi", + "gix-actor 0.26.0", + "gix-date 0.8.0", + "gix-features 0.34.0", + "gix-hash 0.13.0", + "gix-validate", + "itoa", + "smallvec", "thiserror", + "winnow", ] [[package]] @@ -1640,7 +1512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1dd295ca055d8270de23b6037176b03782de753f75c84dabb7713f7d7e229fd" dependencies = [ "arc-swap", - "gix-date", + "gix-date 0.7.4", "gix-features 0.33.0", "gix-hash 0.12.0", "gix-object 0.35.0", @@ -1653,26 +1525,22 @@ dependencies = [ ] [[package]] -name = "gix-pack" -version = "0.40.2" +name = "gix-odb" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f029a4dce9ac91da35c968c3abdcae573b3e52c123be86cbab3011599de533" +checksum = "d0446eca295459deb3d6dd6ed7d44a631479f1b7381d8087166605c7a9f717c6" dependencies = [ - "clru", - "gix-chunk", - "gix-diff 0.33.1", - "gix-features 0.32.1", - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-object 0.33.2", - "gix-path 0.8.4", - "gix-tempfile 7.0.2", - "gix-traverse 0.30.1", - "memmap2", + "arc-swap", + "gix-date 0.8.0", + "gix-features 0.34.0", + "gix-hash 0.13.0", + "gix-object 0.36.0", + "gix-pack 0.42.0", + "gix-path 0.10.0", + "gix-quote", "parking_lot", - "smallvec", + "tempfile", "thiserror", - "uluru", ] [[package]] @@ -1698,6 +1566,27 @@ dependencies = [ "uluru", ] +[[package]] +name = "gix-pack" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be19ee650300d7cbac5829b637685ec44a8d921a7c2eaff8a245d8f2f008870c" +dependencies = [ + "clru", + "gix-chunk", + "gix-features 0.34.0", + "gix-hash 0.13.0", + "gix-hashtable 0.4.0", + "gix-object 0.36.0", + "gix-path 0.10.0", + "gix-tempfile 9.0.0", + "memmap2", + "parking_lot", + "smallvec", + "thiserror", + "uluru", +] + [[package]] name = "gix-packetline" version = "0.16.5" @@ -1722,9 +1611,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c" +checksum = "764b31ac54472e796f08be376eaeea3e30800949650566620809659d39969dbd" dependencies = [ "bstr 1.6.2", "gix-trace", @@ -1735,9 +1624,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764b31ac54472e796f08be376eaeea3e30800949650566620809659d39969dbd" +checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" dependencies = [ "bstr 1.6.2", "gix-trace", @@ -1754,26 +1643,13 @@ checksum = "b4ba6662a29a6332926494542f6144ee87a59df3c70a4c680ebd235b646d7866" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", - "gix-attributes 0.17.0", + "gix-attributes", "gix-config-value 0.13.0", "gix-glob 0.11.0", "gix-path 0.9.0", "thiserror", ] -[[package]] -name = "gix-prompt" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea" -dependencies = [ - "gix-command", - "gix-config-value 0.12.5", - "parking_lot", - "rustix", - "thiserror", -] - [[package]] name = "gix-prompt" version = "0.6.0" @@ -1789,16 +1665,16 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8cf8b48ad5510a6ea3c8b529f51fd0f31009a2e46579f3a0ed917669035170" +checksum = "9ea9a0acfb928bc0cccd6d9e4778ba367328098fe6553ab39d5763f128794bad" dependencies = [ "bstr 1.6.2", "btoi", - "gix-credentials 0.17.1", - "gix-date", - "gix-features 0.32.1", - "gix-hash 0.11.4", + "gix-credentials", + "gix-date 0.7.4", + "gix-features 0.33.0", + "gix-hash 0.12.0", "gix-transport", "maybe-async", "nom", @@ -1816,27 +1692,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-ref" -version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db11edd78bf33043d1969fff51c567a4b30edd77ab44f6f8eb460a4c14985d" -dependencies = [ - "gix-actor 0.24.2", - "gix-date", - "gix-features 0.32.1", - "gix-fs 0.4.1", - "gix-hash 0.11.4", - "gix-lock 7.0.2", - "gix-object 0.33.2", - "gix-path 0.8.4", - "gix-tempfile 7.0.2", - "gix-validate 0.7.7", - "memmap2", - "nom", - "thiserror", -] - [[package]] name = "gix-ref" version = "0.35.0" @@ -1844,7 +1699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993ce5c448a94038b8da1a8969c0facd6c1fbac509fa013344c580458f41527d" dependencies = [ "gix-actor 0.25.0", - "gix-date", + "gix-date 0.7.4", "gix-features 0.33.0", "gix-fs 0.5.0", "gix-hash 0.12.0", @@ -1852,24 +1707,31 @@ dependencies = [ "gix-object 0.35.0", "gix-path 0.9.0", "gix-tempfile 8.0.0", - "gix-validate 0.8.0", + "gix-validate", "memmap2", "thiserror", "winnow", ] [[package]] -name = "gix-refspec" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19a02bf740b326d6c082a7d6f754ebe56eef900986c5e91be7cf000df9ea18d" -dependencies = [ - "bstr 1.6.2", - "gix-hash 0.11.4", - "gix-revision 0.18.1", - "gix-validate 0.7.7", - "smallvec", +name = "gix-ref" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cccbfa8d5cd9b86465f27a521e0c017de54b92d9fd37c143e49c658a2f04f3a" +dependencies = [ + "gix-actor 0.26.0", + "gix-date 0.8.0", + "gix-features 0.34.0", + "gix-fs 0.6.0", + "gix-hash 0.13.0", + "gix-lock 9.0.0", + "gix-object 0.36.0", + "gix-path 0.10.0", + "gix-tempfile 9.0.0", + "gix-validate", + "memmap2", "thiserror", + "winnow", ] [[package]] @@ -1881,23 +1743,22 @@ dependencies = [ "bstr 1.6.2", "gix-hash 0.12.0", "gix-revision 0.20.0", - "gix-validate 0.8.0", + "gix-validate", "smallvec", "thiserror", ] [[package]] -name = "gix-revision" -version = "0.18.1" +name = "gix-refspec" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a13500890435e3b9e7746bceda248646bfc69e259210884c98e29bb7a1aa6f" +checksum = "678ba30d95baa5462df9875628ed40655d5f5b8aba7028de86ed57f36e762c6c" dependencies = [ "bstr 1.6.2", - "gix-date", - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-object 0.33.2", - "gix-revwalk 0.4.1", + "gix-hash 0.13.0", + "gix-revision 0.21.0", + "gix-validate", + "smallvec", "thiserror", ] @@ -1908,7 +1769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2443886b7c55e73a813f203fe8603b94ac5deb3dfad8812d25e731b81f569f27" dependencies = [ "bstr 1.6.2", - "gix-date", + "gix-date 0.7.4", "gix-hash 0.12.0", "gix-hashtable 0.3.0", "gix-object 0.35.0", @@ -1918,17 +1779,18 @@ dependencies = [ ] [[package]] -name = "gix-revwalk" -version = "0.4.1" +name = "gix-revision" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d4cbaf3cfbfde2b81b5ee8b469aff42c34693ce0fe17fc3c244d5085307f2c" +checksum = "b3e80a5992ae446fe1745dd26523b86084e3f1b6b3e35377fe09b4f35ac8f151" dependencies = [ - "gix-commitgraph 0.18.2", - "gix-date", - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-object 0.33.2", - "smallvec", + "bstr 1.6.2", + "gix-date 0.8.0", + "gix-hash 0.13.0", + "gix-hashtable 0.4.0", + "gix-object 0.36.0", + "gix-revwalk 0.7.0", + "gix-trace", "thiserror", ] @@ -1939,7 +1801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "362f71e173364f67d02899388c4b3d2f6bac7c16c0f3a9bbc04683f984f59daa" dependencies = [ "gix-commitgraph 0.19.0", - "gix-date", + "gix-date 0.7.4", "gix-hash 0.12.0", "gix-hashtable 0.3.0", "gix-object 0.35.0", @@ -1947,26 +1809,41 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-revwalk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b806349bc1f668e09035800e07ac8045da4e39a8925a245d93142c4802224ec1" +dependencies = [ + "gix-commitgraph 0.20.0", + "gix-date 0.8.0", + "gix-hash 0.13.0", + "gix-hashtable 0.4.0", + "gix-object 0.36.0", + "smallvec", + "thiserror", +] + [[package]] name = "gix-sec" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7" +checksum = "0debc2e70613a077c257c2bb45ab4f652a550ae1d00bdca356633ea9de88a230" dependencies = [ "bitflags 2.4.0", - "gix-path 0.8.4", + "gix-path 0.9.0", "libc", "windows", ] [[package]] name = "gix-sec" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0debc2e70613a077c257c2bb45ab4f652a550ae1d00bdca356633ea9de88a230" +checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ "bitflags 2.4.0", - "gix-path 0.9.0", + "gix-path 0.10.0", "libc", "windows", ] @@ -1988,11 +1865,11 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "7.0.2" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa28d567848cec8fdd77d36ad4f5f78ecfaba7d78f647d4f63c8ae1a2cec7243" +checksum = "cea558d3daf3b1d0001052b12218c66c8f84788852791333b633d7eeb6999db1" dependencies = [ - "gix-fs 0.4.1", + "gix-fs 0.5.0", "libc", "once_cell", "parking_lot", @@ -2003,16 +1880,14 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea558d3daf3b1d0001052b12218c66c8f84788852791333b633d7eeb6999db1" +checksum = "2762b91ff95e27ff3ea95758c0d4efacd7435a1be3629622928b8276de0f72a8" dependencies = [ - "gix-fs 0.5.0", + "gix-fs 0.6.0", "libc", "once_cell", "parking_lot", - "signal-hook", - "signal-hook-registry", "tempfile", ] @@ -2024,39 +1899,23 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" [[package]] name = "gix-transport" -version = "0.34.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640cf03acc506e0350bc434dd6d7093d91343ed508d2c2166a41da856ab6e5e3" +checksum = "3521e96c5d7d65c1d6bd632820362ac30f66391108126a4a56adb0a5cfe85d77" dependencies = [ "base64", "bstr 1.6.2", "gix-command", - "gix-credentials 0.17.1", - "gix-features 0.32.1", + "gix-credentials", + "gix-features 0.33.0", "gix-packetline", "gix-quote", - "gix-sec 0.8.4", - "gix-url 0.21.1", + "gix-sec 0.9.0", + "gix-url 0.22.0", "reqwest", "thiserror", ] -[[package]] -name = "gix-traverse" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12e0fe428394226c37dd686ad64b09a04b569fe157d638b125b4a4c1e7e2df0" -dependencies = [ - "gix-commitgraph 0.18.2", - "gix-date", - "gix-hash 0.11.4", - "gix-hashtable 0.2.4", - "gix-object 0.33.2", - "gix-revwalk 0.4.1", - "smallvec", - "thiserror", -] - [[package]] name = "gix-traverse" version = "0.31.0" @@ -2064,7 +1923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beecf2e4d8924cbe0cace0bd396f9b037fdf7db9799d5695fe70dcad959ed067" dependencies = [ "gix-commitgraph 0.19.0", - "gix-date", + "gix-date 0.7.4", "gix-hash 0.12.0", "gix-hashtable 0.3.0", "gix-object 0.35.0", @@ -2074,17 +1933,19 @@ dependencies = [ ] [[package]] -name = "gix-url" -version = "0.21.1" +name = "gix-traverse" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4411bdbd1d46b35ae50e84c191660d437f89974e4236627785024be0b577170a" +checksum = "3ec6358f8373fb018af8fc96c9d2ec6a5b66999e2377dc40b7801351fec409ed" dependencies = [ - "bstr 1.6.2", - "gix-features 0.32.1", - "gix-path 0.8.4", - "home", + "gix-commitgraph 0.20.0", + "gix-date 0.8.0", + "gix-hash 0.13.0", + "gix-hashtable 0.4.0", + "gix-object 0.36.0", + "gix-revwalk 0.7.0", + "smallvec", "thiserror", - "url", ] [[package]] @@ -2102,22 +1963,26 @@ dependencies = [ ] [[package]] -name = "gix-utils" -version = "0.1.5" +name = "gix-url" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +checksum = "1c79d595b99a6c7ab274f3c991735a0c0f5a816a3da460f513c48edf1c7bf2cc" dependencies = [ - "fastrand", + "bstr 1.6.2", + "gix-features 0.34.0", + "gix-path 0.10.0", + "home", + "thiserror", + "url", ] [[package]] -name = "gix-validate" -version = "0.7.7" +name = "gix-utils" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" +checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" dependencies = [ - "bstr 1.6.2", - "thiserror", + "fastrand", ] [[package]] @@ -2130,28 +1995,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "gix-worktree" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8bb6dd57dc6c9dfa03cc2cf2cc0942edae405eb6dfd1c34dbd2be00a90cab2" -dependencies = [ - "bstr 1.6.2", - "filetime", - "gix-attributes 0.16.0", - "gix-features 0.32.1", - "gix-filter 0.2.0", - "gix-fs 0.4.1", - "gix-glob 0.10.2", - "gix-hash 0.11.4", - "gix-ignore 0.5.1", - "gix-index 0.21.1", - "gix-object 0.33.2", - "gix-path 0.8.4", - "io-close", - "thiserror", -] - [[package]] name = "gix-worktree" version = "0.24.0" @@ -2159,12 +2002,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a38eab0fdd752ecfa50130c127c9f42bd329bf7f4e52872f4ac24c12bbc02baf" dependencies = [ "bstr 1.6.2", - "gix-attributes 0.17.0", + "gix-attributes", "gix-features 0.33.0", "gix-fs 0.5.0", "gix-glob 0.11.0", "gix-hash 0.12.0", - "gix-ignore 0.6.0", + "gix-ignore", "gix-index 0.22.0", "gix-object 0.35.0", "gix-path 0.9.0", @@ -2178,14 +2021,14 @@ checksum = "44629a04d238493f0da657a0eee4d60086f0172c364ca4a71398b1898fda32a6" dependencies = [ "bstr 1.6.2", "gix-features 0.33.0", - "gix-filter 0.3.0", + "gix-filter", "gix-fs 0.5.0", "gix-glob 0.11.0", "gix-hash 0.12.0", "gix-index 0.22.0", "gix-object 0.35.0", "gix-path 0.9.0", - "gix-worktree 0.24.0", + "gix-worktree", "io-close", "thiserror", ] @@ -2269,12 +2112,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "home" version = "0.5.5" @@ -2284,17 +2121,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - [[package]] name = "http" version = "0.2.9" @@ -2383,17 +2209,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -2462,18 +2277,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2 0.5.3", - "widestring", - "windows-sys 0.48.0", - "winreg", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -2565,12 +2368,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.5" @@ -2593,33 +2390,12 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "maplit" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "maybe-async" version = "0.2.7" @@ -2843,12 +2619,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "predicates" version = "3.0.3" @@ -2899,10 +2669,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d67eb4220992a4a052a4bb03cf776e493ecb1a3a36bab551804153d63486af7" [[package]] -name = "quick-error" -version = "1.2.3" +name = "prodash" +version = "26.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "50bcc40e3e88402f12b15f94d43a2c7673365e9601cc52795e119b95a266100c" [[package]] name = "quote" @@ -2913,36 +2683,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - [[package]] name = "rayon" version = "1.7.0" @@ -3062,7 +2802,6 @@ dependencies = [ "tokio-rustls", "tokio-util", "tower-service", - "trust-dns-resolver", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -3071,16 +2810,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - [[package]] name = "ring" version = "0.16.20" @@ -3478,21 +3207,24 @@ dependencies = [ [[package]] name = "tame-index" -version = "0.2.5" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b8105f79989496b426b812cdbe61633dcb83f2b0b88b410949dc8b4d3f1c27" +checksum = "239b73acdc37c857aae3832bdc739b937b038e5e8b148191a79545a2beb5af74" dependencies = [ "camino", - "gix 0.50.1", + "crossbeam-channel", + "gix 0.52.0", "home", "http", "memchr", + "rayon", "reqwest", "semver", "serde", "serde_json", "smol_str", "thiserror", + "tokio", "toml", "twox-hash", ] @@ -3704,21 +3436,9 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.31", -] - [[package]] name = "tracing-core" version = "0.1.31" @@ -3728,51 +3448,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "trustfall" version = "0.6.1" @@ -3952,7 +3627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] @@ -4093,12 +3768,6 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index deceae69c..3ca6333ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,11 @@ clap-cargo = { version = "0.10.0", features = ["cargo_metadata"] } ignore = "0.4.18" clap-verbosity-flag = "2.0.0" log = "0.4.17" -gix = { version = "0.52.0", default-features = false, features = ["max-performance"] } -tame-index = { version = "0.2", features = ["git", "sparse"] } +# Note that `tame-index` and `gix` must be upgraded in lock-step to retain the same `gix` +# minor version. Otherwise, one will compile `gix` two times in different minor versions. +gix = { version = "0.53.1", default-features = false, features = ["max-performance", "revision"] } +tame-index = { version = "0.5.5", features = ["git", "sparse"] } + human-panic = "1.0.3" bugreport = "0.5.0" itertools = "0.11.0" diff --git a/src/rustdoc_gen.rs b/src/rustdoc_gen.rs index 0c8ca8045..d4318239a 100644 --- a/src/rustdoc_gen.rs +++ b/src/rustdoc_gen.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use anyhow::Context as _; +use anyhow::{bail, Context as _}; use itertools::Itertools; use serde::Serialize; use sha2::{Digest, Sha256}; @@ -648,6 +648,7 @@ impl RustdocFromRegistry { .context("failed to build HTTP client")?; index::RemoteSparseIndex::new(sparse, client).into() } + _ => bail!("encountered unknown cache type"), }; Ok(Self { @@ -676,6 +677,7 @@ fn choose_baseline_version( .map(|iv| (iv.version.clone(), iv.is_yanked())) // For unpublished changes when the user doesn't increment the version // post-release, allow using the current version as a baseline. + .filter_map(|(v, yanked)| semver::Version::parse(v.as_str()).ok().map(|v| (v, yanked))) .filter(|(v, _)| v <= current) .collect::>(); instances.sort(); @@ -693,16 +695,18 @@ fn choose_baseline_version( ) }) } else { - let instance = crate_ - .highest_normal_version() - .unwrap_or_else(|| { - // If there is no normal version (not yanked and not a pre-release) - // choosing the latest one anyway is more reasonable than throwing an - // error, as there is still a chance that it is what the user expects. - crate_.highest_version() - }) - .version - .clone(); + let instance = semver::Version::parse( + crate_ + .highest_normal_version() + .unwrap_or_else(|| { + // If there is no normal version (not yanked and not a pre-release) + // choosing the latest one anyway is more reasonable than throwing an + // error, as there is still a chance that it is what the user expects. + crate_.highest_version() + }) + .version + .as_str(), + )?; Ok(instance) } } @@ -744,7 +748,9 @@ impl RustdocGenerator for RustdocFromRegistry { let crate_ = crate_ .versions .iter() - .find(|v| v.version == base_version) + .find(|v| { + semver::Version::parse(v.version.as_str()).ok().as_ref() == Some(&base_version) + }) .with_context(|| { anyhow::format_err!( "Version {} of crate {} not found in registry", @@ -790,7 +796,7 @@ mod tests { use super::choose_baseline_version; fn new_mock_version(version: semver::Version, yanked: bool) -> IndexVersion { - let mut iv = IndexVersion::fake("test-crate", version); + let mut iv = IndexVersion::fake("test-crate", version.to_string()); iv.yanked = yanked; iv }