From ce76a6dc64e505eb660f090cd7b3070965d09aca Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 20 Feb 2023 18:05:40 +0100 Subject: [PATCH] upgrade `gix` to 0.36.1 to avoid breakage. (#965) A recent release of `bstr` exposed incorrect usage of `as_ref()` causing compilation errors. Using v0.36.1 fixes the issue. --- Cargo.lock | 537 +++++++++------------------------------------- Cargo.toml | 4 +- benches/repo.rs | 2 +- src/info/title.rs | 2 +- tests/repo.rs | 2 +- 5 files changed, 106 insertions(+), 441 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bbeb1ae5..101fa3b6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "once_cell", @@ -957,71 +957,6 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -[[package]] -name = "git-actor" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7def29b46f25f95a2e196323cfb336eae9965e0a3c7c35ad9506f295c3a8e234" -dependencies = [ - "bstr 1.0.1", - "btoi", - "git-date", - "itoa", - "nom", - "quick-error", -] - -[[package]] -name = "git-attributes" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0affaed361598fdd06b2a184a566c823d0b5817b09f576018248fb267193a96" -dependencies = [ - "bstr 1.0.1", - "compact_str", - "git-features 0.25.1", - "git-glob", - "git-path", - "git-quote", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "git-bitmap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44304093ac66a0ada1b243c15c3a503a165a1d0f50bec748f4e5a9b84a0d0722" -dependencies = [ - "quick-error", -] - -[[package]] -name = "git-date" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2874ce2f3a77cb144167901ea830969e5c991eac7bfee85e6e3f53ef9fcdf2" -dependencies = [ - "bstr 1.0.1", - "itoa", - "thiserror", - "time", -] - -[[package]] -name = "git-discover" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c244b1cf7cf45501116e948506c25324e33ddc613f00557ff5bfded2132009" -dependencies = [ - "bstr 1.0.1", - "git-hash 0.10.1", - "git-path", - "git-ref", - "git-sec", - "thiserror", -] - [[package]] name = "git-features" version = "0.23.1" @@ -1029,31 +964,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be88ae837674c71b30c6517c6f5f1335f8135bb8a9ffef20000d211933bed08" dependencies = [ "flate2", - "git-hash 0.9.11", - "libc", -] - -[[package]] -name = "git-features" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f98e6ede7b790dfba16bf3c62861ae75c3719485d675b522cf7d7e748a4011c" -dependencies = [ - "git-hash 0.10.1", + "git-hash", "libc", - "prodash 22.1.0", - "sha1_smol", - "walkdir", -] - -[[package]] -name = "git-glob" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3908404c9b76ac7b3f636a104142378d3eaa78623cbc6eb7c7f0651979d48e8a" -dependencies = [ - "bitflags", - "bstr 1.0.1", ] [[package]] @@ -1066,210 +978,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "git-hash" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1532d82bf830532f8d545c5b7b568e311e3593f16cf7ee9dd0ce03c74b12b99d" -dependencies = [ - "hex", - "thiserror", -] - -[[package]] -name = "git-hashtable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52b625ad8cc360a0b7f426266f21fb07bd49b8f4ccf1b3ca7bc89424db1dec4" -dependencies = [ - "git-hash 0.10.1", - "hashbrown 0.13.1", -] - -[[package]] -name = "git-index" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20627f71f3a884b0ae50f9f3abb3a07d9b117d06e16110d25b85da4d71d478c0" -dependencies = [ - "atoi", - "bitflags", - "bstr 1.0.1", - "filetime", - "git-bitmap", - "git-features 0.25.1", - "git-hash 0.10.1", - "git-lock", - "git-object", - "git-traverse", - "itoa", - "memmap2 0.5.3", - "smallvec", - "thiserror", -] - -[[package]] -name = "git-lock" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e4f05b8a68c3a5dd83a6651c76be384e910fe283072184fdab9d77f87ccec2" -dependencies = [ - "fastrand", - "git-tempfile", - "quick-error", -] - -[[package]] -name = "git-object" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b658f1e3e149d88cb3e0a2234be749bb0cab65887405975dbe6f3190cf6571" -dependencies = [ - "bstr 1.0.1", - "btoi", - "git-actor", - "git-features 0.25.1", - "git-hash 0.10.1", - "git-validate", - "hex", - "itoa", - "nom", - "smallvec", - "thiserror", -] - -[[package]] -name = "git-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40e68481a06da243d3f4dfd86a4be39c24eefb535017a862e845140dcdb878a" -dependencies = [ - "bstr 1.0.1", - "thiserror", -] - -[[package]] -name = "git-quote" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd11f4e7f251ab297545faa4c5a4517f4985a43b9c16bf96fa49107f58e837f" -dependencies = [ - "bstr 1.0.1", - "btoi", - "quick-error", -] - -[[package]] -name = "git-ref" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b7d719e4320179fb64d081016e7faca56fed4a8ee4cf84e4697faad9235a3" -dependencies = [ - "git-actor", - "git-features 0.25.1", - "git-hash 0.10.1", - "git-lock", - "git-object", - "git-path", - "git-tempfile", - "git-validate", - "memmap2 0.5.3", - "nom", - "thiserror", -] - -[[package]] -name = "git-sec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1802e8252fa223b0ad89a393aed461132174ced1e6842a41f56dc92a3fc14f" -dependencies = [ - "bitflags", - "dirs 4.0.0", - "git-path", - "libc", - "windows 0.40.0", -] - -[[package]] -name = "git-tempfile" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6bb4dee86c8cae5a078cfaac3b004ef99c31548ed86218f23a7ff9b4b74f3be" -dependencies = [ - "dashmap 5.3.3", - "libc", - "once_cell", - "signal-hook", - "signal-hook-registry", - "tempfile", -] - -[[package]] -name = "git-testtools" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601339eb7e5a66d4d8c8174be0b16e87d64c97783d24c4cc7114e8563e8ad355" -dependencies = [ - "bstr 1.0.1", - "crc", - "fastrand", - "fs_extra", - "git-attributes", - "git-discover", - "git-hash 0.10.1", - "git-lock", - "git-worktree", - "io-close", - "is_ci", - "nom", - "once_cell", - "parking_lot 0.12.1", - "tar", - "tempfile", - "xz2", -] - -[[package]] -name = "git-traverse" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5141dde56d0c4861193c760e01fb61c7e03a32d0840ba93a0ac1c597588d4d" -dependencies = [ - "git-hash 0.10.1", - "git-hashtable", - "git-object", - "thiserror", -] - -[[package]] -name = "git-validate" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0431cf9352c596dc7c8ec9066ee551ce54e63c86c3c767e5baf763f6019ff3c2" -dependencies = [ - "bstr 1.0.1", - "thiserror", -] - -[[package]] -name = "git-worktree" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d748c54c3d904c914b987654a1416c7abe7cf048fdc83eeae69e6ac3d76f20" -dependencies = [ - "bstr 1.0.1", - "git-attributes", - "git-features 0.25.1", - "git-glob", - "git-hash 0.10.1", - "git-index", - "git-object", - "git-path", - "io-close", - "thiserror", -] - [[package]] name = "git2" version = "0.16.1" @@ -1285,9 +993,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9b72a4d85749e43bf83973dcbf5fdd1f1fa4a45c10ddec6927f2123a23dc4" +checksum = "f3d5dbcb1efbee862cdc851a23377e1a8a5c1a8971740b4933d4ce022a0889a8" dependencies = [ "gix-actor", "gix-attributes", @@ -1319,7 +1027,7 @@ dependencies = [ "gix-worktree", "log", "once_cell", - "prodash 23.0.0", + "prodash", "signal-hook", "smallvec", "thiserror", @@ -1328,11 +1036,11 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65310ccef7c317373401a301e76899b2721f07e2d683e35782a0f51a58d084a4" +checksum = "381153ea93b9d8a5c6894a5c734b2e9c15d623063adfd2bda4342ecf90f9a5f8" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "btoi", "gix-date", "itoa", @@ -1342,11 +1050,11 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f15e59e1331c21bae0cfc0c778470984691694c5ed24c1ea262c70e6d3d3c356" +checksum = "df09b20424fd4cee04c43b50df954c4b119c45b769639b60d80ee8bb6d84e0aa" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "compact_str", "gix-features", "gix-glob", @@ -1376,20 +1084,20 @@ dependencies = [ [[package]] name = "gix-command" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94361dd657304ce572162fbee6172bf6521c0babf2f53aeaac298b99f2ac4ac5" +checksum = "b2c6f75c1e0f924de39e750880a6e21307194bb1ab773efe3c7d2d787277f8ab" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", ] [[package]] name = "gix-config" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a860fb7af40f84bd10d0cd28c930c27b4a0d94bd9d22276010d5a396bf9fba" +checksum = "398b5003d5e4991355528e8fbb4a9d532050c8327df790522735a711db82fcd0" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-config-value", "gix-features", "gix-glob", @@ -1411,7 +1119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331" dependencies = [ "bitflags", - "bstr 1.0.1", + "bstr 1.3.0", "gix-path", "libc", "thiserror", @@ -1419,11 +1127,11 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0ad88fc6f1569005f4b4413aa68be501280071679b5565c62e08b8955fdcfe7" +checksum = "5d1536399f70146825bd10321adc5307032e3de93f4954a3c54184281f2e6955" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-command", "gix-config-value", "gix-path", @@ -1435,11 +1143,11 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd587bf0e5bec82bc90a15436a1274ef162e7c184b152a515b544c356ce737fb" +checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "itoa", "thiserror", "time", @@ -1459,11 +1167,11 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a99111861b26cff75cbff262913eb8a153d87b54c6d59870f1e1cd10629c47" +checksum = "38029783886cb46fbe63e61b02a70404aa04cfeacfb53ed336832c20fcb1e281" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "dunce", "gix-hash", "gix-path", @@ -1474,9 +1182,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.26.4" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305ade1187cb77759f9f159efa294c774117108f5236b227a3912fa0e93e8f53" +checksum = "3402b831ea4bb3af36369d61dbf250eb0e1a8577d3cb77b9719c11a82485bfe9" dependencies = [ "crc32fast", "crossbeam-channel", @@ -1488,7 +1196,7 @@ dependencies = [ "num_cpus", "once_cell", "parking_lot 0.12.1", - "prodash 23.0.0", + "prodash", "quick-error", "sha1_smol", "walkdir", @@ -1496,19 +1204,19 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f30e5d3048e99c3a6d1c9663b6dad445927e3e22cf920400b8efe8d7d22cd6" +checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" dependencies = [ "bitflags", - "bstr 1.0.1", + "bstr 1.3.0", ] [[package]] name = "gix-hash" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b2398b0ebd1124897573785bbe058ad1509007acffb6d5d06b34f22486b395" +checksum = "0c0c5a9f4d621d4f4ea046bb331df5c746ca735b8cae5b234cc2be70ee4dbef0" dependencies = [ "hex", "thiserror", @@ -1526,13 +1234,13 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a50c215cf1b9e75f0233f9da0c923d2f9c96c7716699bef4a254fa633852e6f" +checksum = "decb345476c25434a202f1cf8a24aa71133c567b7b502c549fd57211c51ed78a" dependencies = [ "atoi", "bitflags", - "bstr 1.0.1", + "bstr 1.3.0", "filetime", "gix-bitmap", "gix-features", @@ -1559,22 +1267,22 @@ dependencies = [ [[package]] name = "gix-mailmap" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42c8cfd39c3918f49c89cf536ad31326f090497fc7d6a6ee1fb2f7ca6a2761c1" +checksum = "a28214e75835ab33d34210a18981110642728bf169f5e339dbfb6f6380b94318" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-actor", "quick-error", ] [[package]] name = "gix-object" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50aa6cef257ce5fdbadf233b5c4dde95372a3398c78dd797e8544fb2ca8340a7" +checksum = "de3b04e3028ddab838d005104f234f4d2c26ecd51f2d72d96747c878094c4619" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "btoi", "gix-actor", "gix-features", @@ -1607,9 +1315,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.30.2" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1195622bf4a834d51ce4a9a09babd2b007348ebd4f0259f03d651325fb1063c" +checksum = "26143c5c8bc145a39e9b335cc74504f2eba2ce68b1724661d8e6cb4484ab187e" dependencies = [ "bytesize", "clru", @@ -1632,11 +1340,11 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d65ea92e9d9164a9bf68b4f46a52046e4ebd672eba949fa4170b450874346a" +checksum = "f6c104a66dec149cb8f7aaafc6ab797654cf82d67f050fd0cb7e7294e328354b" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "thiserror", ] @@ -1655,20 +1363,20 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34c4b760c94207ac759395f8bcd408a38fce36823e12914ba51ea36569995d6" +checksum = "e34cffcf5dd0ddf06a768b697a0f29319284deffba970e4355b51b0fee61ffa2" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "btoi", "quick-error", ] [[package]] name = "gix-ref" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec528dcabc49516a903938c12ed63e698edf8d0cca11ef1c62d625aee6e49d3" +checksum = "93e85abee11aa093f24da7336bf0a8ad598f15da396b28cf1270ab1091137d35" dependencies = [ "gix-actor", "gix-features", @@ -1685,11 +1393,11 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc671b994c4bb8b19456af831e8bcc83bfca308130cc8e205c7f87920a00d94f" +checksum = "ac80b201eeeb3bc554583fd0127cb6bc9e20981cabb085149c9740329f8a2319" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-hash", "gix-revision", "gix-validate", @@ -1699,11 +1407,11 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878e67f0b8da0cb7a5a18135bc2bc765a49ea3f98946618ad2d713be1036e8eb" +checksum = "107a10d92379a797bea0f1d0eceded58e08913e0a706c8d436592673c6c6503f" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-date", "gix-hash", "gix-hashtable", @@ -1721,7 +1429,7 @@ dependencies = [ "dirs 4.0.0", "gix-path", "libc", - "windows 0.43.0", + "windows", ] [[package]] @@ -1738,6 +1446,30 @@ dependencies = [ "tempfile", ] +[[package]] +name = "gix-testtools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43311e3e9baef2ef05915a930ce58a023deeaa22f8d4e1aa1ac59727f3282202" +dependencies = [ + "bstr 1.3.0", + "crc", + "fastrand", + "fs_extra", + "gix-attributes", + "gix-discover", + "gix-lock", + "gix-worktree", + "io-close", + "is_ci", + "nom", + "once_cell", + "parking_lot 0.12.1", + "tar", + "tempfile", + "xz2", +] + [[package]] name = "gix-traverse" version = "0.22.1" @@ -1752,11 +1484,11 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c0b9b6db2b17e233e08051cb4b5fab9b1eb143e8ed51b1f2edb339ddb0334d" +checksum = "4d6e3e05267f7873099b3e510ab8eebdfc28920a915ab2e3d549493abe0fd9f0" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-features", "gix-path", "home", @@ -1766,21 +1498,21 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ac70b5ec6aacd32d8dfac59e0f362f39df4668c230465af849451b896e2e68" +checksum = "b69ddb780ea1465255e66818d75b7098371c58dbc9560da4488a44b9f5c7e443" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "thiserror", ] [[package]] name = "gix-worktree" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc853a942e802533a6b83fbef066d8a285fb61c94519a656e66204ab190902c9" +checksum = "da7ddd5b042c85cfe768d5ea97bb204cf1ed2b9413148f482146f4e831ca172e" dependencies = [ - "bstr 1.0.1", + "bstr 1.3.0", "gix-attributes", "gix-features", "gix-glob", @@ -2421,10 +2153,10 @@ dependencies = [ "clap_complete", "criterion", "enable-ansi-support", - "git-features 0.23.1", - "git-testtools", + "git-features", "git2", "gix", + "gix-testtools", "human-panic", "image", "insta", @@ -2784,16 +2516,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prodash" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2b91fcc982d0d8ae5e9d477561c73e09c24c5c19bac4858e202f6f065a13e" -dependencies = [ - "bytesize", - "human_format", -] - [[package]] name = "prodash" version = "23.0.0" @@ -3724,33 +3446,18 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30acc718a52fb130fec72b1cb5f55ffeeec9253e1b785e94db222178a6acaa1" -dependencies = [ - "windows_aarch64_gnullvm 0.40.0", - "windows_aarch64_msvc 0.40.0", - "windows_i686_gnu 0.40.0", - "windows_i686_msvc 0.40.0", - "windows_x86_64_gnu 0.40.0", - "windows_x86_64_gnullvm 0.40.0", - "windows_x86_64_msvc 0.40.0", -] - [[package]] name = "windows" version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ - "windows_aarch64_gnullvm 0.42.0", + "windows_aarch64_gnullvm", "windows_aarch64_msvc 0.42.0", "windows_i686_gnu 0.42.0", "windows_i686_msvc 0.42.0", "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_gnullvm", "windows_x86_64_msvc 0.42.0", ] @@ -3773,21 +3480,15 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm 0.42.0", + "windows_aarch64_gnullvm", "windows_aarch64_msvc 0.42.0", "windows_i686_gnu 0.42.0", "windows_i686_msvc 0.42.0", "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_gnullvm", "windows_x86_64_msvc 0.42.0", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3caa4a1a16561b714323ca6b0817403738583033a6a92e04c5d10d4ba37ca10" - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.0" @@ -3800,12 +3501,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -[[package]] -name = "windows_aarch64_msvc" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328973c62dfcc50fb1aaa8e7100676e0b642fe56bac6bafff3327902db843ab4" - [[package]] name = "windows_aarch64_msvc" version = "0.42.0" @@ -3818,12 +3513,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -[[package]] -name = "windows_i686_gnu" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5b09fad70f0df85dea2ac2a525537e415e2bf63ee31cf9b8e263645ee9f3c1" - [[package]] name = "windows_i686_gnu" version = "0.42.0" @@ -3836,12 +3525,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -[[package]] -name = "windows_i686_msvc" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1ad4031c1a98491fa195d8d43d7489cb749f135f2e5c4eed58da094bd0d876" - [[package]] name = "windows_i686_msvc" version = "0.42.0" @@ -3854,24 +3537,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -[[package]] -name = "windows_x86_64_gnu" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520ff37edd72da8064b49d2281182898e17f0688ae9f4070bca27e4b5c162ac7" - [[package]] name = "windows_x86_64_gnu" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046e5b82215102c44fd75f488f1b9158973d02aa34d06ed85c23d6f5520a2853" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.0" @@ -3884,12 +3555,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -[[package]] -name = "windows_x86_64_msvc" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0c9c6df55dd1bfa76e131cef44bdd8ec9c819ef3611f04dfe453fd5bfeda28" - [[package]] name = "windows_x86_64_msvc" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index e277b0557..d653e93d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ clap_complete = "4.1.0" git-features-for-configuration-only = { package = "git-features", version = "0.23.1", features = [ "zlib-ng-compat", ] } -gix = { version = "0.36.0", default-features = false, features = [ +gix = { version = "0.36.1", default-features = false, features = [ "max-performance-safe", ] } git2 = { version = "0.16.1", default-features = false } @@ -53,7 +53,7 @@ yaml-rust = "0.4.5" [dev-dependencies] criterion = "0.4.0" -git-testtools = "0.10.0" +gix-testtools = "0.11.0" insta = { version = "1.23.0", features = ["json", "redactions"] } pretty_assertions = "1.3.0" diff --git a/benches/repo.rs b/benches/repo.rs index a978b22ab..91607cffe 100644 --- a/benches/repo.rs +++ b/benches/repo.rs @@ -4,7 +4,7 @@ use onefetch::{cli::Config, info::Info}; fn bench_repo_info(c: &mut Criterion) { let name = "repo.sh".to_string(); - let repo_path = git_testtools::scripted_fixture_read_only(name).unwrap(); + let repo_path = gix_testtools::scripted_fixture_read_only(name).unwrap(); let repo = ThreadSafeRepository::open_opts(repo_path, open::Options::isolated()).unwrap(); let config: Config = Config { input: repo.path().to_path_buf(), diff --git a/src/info/title.rs b/src/info/title.rs index 0d241c7ba..ee224079a 100644 --- a/src/info/title.rs +++ b/src/info/title.rs @@ -93,7 +93,7 @@ mod tests { fn repo(name: &str) -> Result { let name = name.to_string(); - let repo_path = git_testtools::scripted_fixture_read_only(name).unwrap(); + let repo_path = gix_testtools::scripted_fixture_read_only(name).unwrap(); let safe_repo = ThreadSafeRepository::open_opts(repo_path, open::Options::isolated())?; Ok(safe_repo.to_thread_local()) } diff --git a/tests/repo.rs b/tests/repo.rs index 5cbb48a0c..cfe98e199 100644 --- a/tests/repo.rs +++ b/tests/repo.rs @@ -5,7 +5,7 @@ use onefetch::info::{get_work_dir, Info}; fn repo(name: &str) -> Result { let name = name.to_string(); - let repo_path = git_testtools::scripted_fixture_read_only(name).unwrap(); + let repo_path = gix_testtools::scripted_fixture_read_only(name).unwrap(); let safe_repo = ThreadSafeRepository::open_opts(repo_path, open::Options::isolated())?; Ok(safe_repo.to_thread_local()) }