From 6a604b46718b3320b3136619dd0c2064aba692c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Oct 2025 09:41:49 +0200 Subject: [PATCH] build(deps): update rust crate gix to 0.74.0 (#7061) * build(deps): update rust crate gix to 0.74.0 * chore: fix for enum change --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Knaack --- Cargo.lock | 248 +++++++++++++++++--------------------- Cargo.toml | 2 +- src/modules/git_status.rs | 2 +- 3 files changed, 112 insertions(+), 140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fa211ce2..0fe55a688 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "aho-corasick" version = "1.1.3" @@ -885,17 +879,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" -[[package]] -name = "flate2" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" -dependencies = [ - "crc32fast", - "libz-rs-sys", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -908,6 +891,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -983,9 +972,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.73.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c29cc879bdc0286b0cbc205585a49b252809eb86c69df4ce4f855ee75f635" +checksum = "d3fd3d8b30e15352c955ae99f3497a7ee5e346a6fa2662fc9301001691c4fb7e" dependencies = [ "gix-actor", "gix-attributes", @@ -1026,16 +1015,15 @@ dependencies = [ "gix-utils", "gix-validate", "gix-worktree", - "once_cell", "smallvec", "thiserror 2.0.17", ] [[package]] name = "gix-actor" -version = "0.35.4" +version = "0.35.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d36dcf9efe32b51b12dfa33cedff8414926124e760a32f9e7a6b5580d280967" +checksum = "575bb2dafa4e56721c0f7e8b2da647452e6c10c69b6157b118388a132cccb892" dependencies = [ "bstr", "gix-date", @@ -1047,9 +1035,9 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45442188216d08a5959af195f659cb1f244a50d7d2d0c3873633b1cd7135f638" +checksum = "42bbbbe6e01d238f7cf1ce7f604d742e91639006f2ac1685b008cfa55903206d" dependencies = [ "bstr", "gix-glob", @@ -1064,27 +1052,27 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1db9765c69502650da68f0804e3dc2b5f8ccc6a2d104ca6c85bc40700d37540" +checksum = "5e150161b8a75b5860521cb876b506879a3376d3adc857ec7a9d35e7c6a5e531" dependencies = [ "thiserror 2.0.17", ] [[package]] name = "gix-chunk" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f" +checksum = "5c356b3825677cb6ff579551bb8311a81821e184453cbd105e2fc5311b288eeb" dependencies = [ "thiserror 2.0.17", ] [[package]] name = "gix-command" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b31b65ca48a352ae86312b27a514a0c661935f96b481ac8b4371f65815eb196" +checksum = "095c8367c9dc4872a7706fbc39c7f34271b88b541120a4365ff0e36366f66e62" dependencies = [ "bstr", "gix-path", @@ -1095,9 +1083,9 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb23121e952f43a5b07e3e80890336cb847297467a410475036242732980d06" +checksum = "5b7c0f17a94a27283afce5c1c5d7b1778cacc0a70bb8affc0e38611f06ffcb2b" dependencies = [ "bstr", "gix-chunk", @@ -1108,9 +1096,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfb898c5b695fd4acfc3c0ab638525a65545d47706064dcf7b5ead6cdb136c0" +checksum = "76acbe8307019b17411a3c50e181e4dd97d78a840dead884a4f2dd35a8d38f6a" dependencies = [ "bstr", "gix-config-value", @@ -1120,7 +1108,6 @@ dependencies = [ "gix-ref", "gix-sec", "memchr", - "once_cell", "smallvec", "thiserror 2.0.17", "unicode-bom", @@ -1129,9 +1116,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f012703eb67e263c6c1fc96649fec47694dd3e5d2a91abfc65e4a6a6dc85309" +checksum = "7d837b93598b240624ed9b30f3a7629dc6088db60a025c90a628116a16d26719" dependencies = [ "bitflags 2.10.0", "bstr", @@ -1142,9 +1129,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996b6b90bafb287330af92b274c3e64309dc78359221d8612d11cd10c8b9fe1c" +checksum = "36911ec97d0343048c6ecbcd2dcbcc6a9adf8272845417593915d1f8514b44ee" dependencies = [ "bstr", "itoa", @@ -1155,9 +1142,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.53.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de854852010d44a317f30c92d67a983e691c9478c8a3fb4117c1f48626bcdea8" +checksum = "b9844abf11a6dc5ab1d9e8670e17d35afbfebbebe216522454883140745bc68b" dependencies = [ "bstr", "gix-attributes", @@ -1179,9 +1166,9 @@ dependencies = [ [[package]] name = "gix-dir" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad34e4f373f94902df1ba1d2a1df3a1b29eacd15e316ac5972d842e31422dd7" +checksum = "f99fb4dcba076453d791949bf3af977c5678a1cbd76740ec2cfe37e29431daf3" dependencies = [ "bstr", "gix-discover", @@ -1199,9 +1186,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb180c91ca1a2cf53e828bb63d8d8f8fa7526f49b83b33d7f46cbeb5d79d30a" +checksum = "9d24547153810634636471af88338240e6ab0831308cd41eb6ebfffea77811c6" dependencies = [ "bstr", "dunce", @@ -1215,17 +1202,17 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1543cd9b8abcbcebaa1a666a5c168ee2cda4dea50d3961ee0e6d1c42f81e5b" +checksum = "4ff90017694214e1445b1baab8ca299e548cdf42c9d4588c02017c352d32652b" dependencies = [ "crc32fast", "crossbeam-channel", - "flate2", "gix-path", "gix-trace", "gix-utils", "libc", + "libz-rs-sys", "once_cell", "parking_lot", "prodash", @@ -1235,9 +1222,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa6571a3927e7ab10f64279a088e0dae08e8da05547771796d7389bbe28ad9ff" +checksum = "1d1253452c9808da01eaaf9b1c4929b9982efec29ef0a668b3326b8046d9b8fb" dependencies = [ "bstr", "encoding_rs", @@ -1256,9 +1243,9 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4d90307d064fa7230e0f87b03231be28f8ba63b913fc15346f489519d0c304" +checksum = "3f1ecd896258cdc5ccd94d18386d17906b8de265ad2ecf68e3bea6b007f6a28f" dependencies = [ "bstr", "fastrand", @@ -1270,9 +1257,9 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b947db8366823e7a750c254f6bb29e27e17f27e457bf336ba79b32423db62cd5" +checksum = "56089c688b74d628bdd7f38c9cadf08d39948c783decc48474cbfdf341ba68c4" dependencies = [ "bitflags 2.10.0", "bstr", @@ -1282,9 +1269,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251fad79796a731a2a7664d9ea95ee29a9e99474de2769e152238d4fdb69d50e" +checksum = "0732910f9595d1600a6355f37241c1960a851a7250df0e04ad0dad85a20cbf73" dependencies = [ "faster-hex", "gix-features", @@ -1294,20 +1281,20 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35300b54896153e55d53f4180460931ccd69b7e8d2f6b9d6401122cdedc4f07" +checksum = "a27d4a3ea9640da504a2657fef3419c517fd71f1767ad8935298bcc805edd195" dependencies = [ "gix-hash", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "parking_lot", ] [[package]] name = "gix-ignore" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564d6fddf46e2c981f571b23d6ad40cb08bddcaf6fc7458b1d49727ad23c2870" +checksum = "cd53028c6adea0b41e0ae35499542f164115c555b6c15b80778e4c22b148a3d0" dependencies = [ "bstr", "gix-glob", @@ -1318,9 +1305,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af39fde3ce4ce11371d9ce826f2936ec347318f2d1972fe98c2e7134e267e25" +checksum = "91c389a09b9575b6e856bf2199bd717f5bd5e37333c24575a0cf9d08c41d75d6" dependencies = [ "bitflags 2.10.0", "bstr", @@ -1335,7 +1322,7 @@ dependencies = [ "gix-traverse", "gix-utils", "gix-validate", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "itoa", "libc", "memmap2", @@ -1346,9 +1333,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "18.0.0" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fa71da90365668a621e184eb5b979904471af1b3b09b943a84bc50e8ad42ed" +checksum = "729d7857429a66023bc0c29d60fa21d0d6ae8862f33c1937ba89e0f74dd5c67f" dependencies = [ "gix-tempfile", "gix-utils", @@ -1357,9 +1344,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.50.2" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69ce108ab67b65fbd4fb7e1331502429d78baeb2eee10008bdef55765397c07" +checksum = "f4d23c75c112f03724792155ff847f12df6396e2528a5f2ed26eca2cf9a11896" dependencies = [ "bstr", "gix-actor", @@ -1378,9 +1365,9 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.70.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9d7af10fda9df0bb4f7f9bd507963560b3c66cb15a5b825caf752e0eb109ac" +checksum = "8c5f6d4ba857982cd2225de0a5d8b61d3b63a314395327f8a15943977203da08" dependencies = [ "arc-swap", "gix-date", @@ -1399,9 +1386,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.60.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8571df89bfca5abb49c3e3372393f7af7e6f8b8dbe2b96303593cef5b263019" +checksum = "b3afaaa2205a477f5c59a5459bad9205e6de438d218d2af6f0092e19cec03a60" dependencies = [ "clru", "gix-chunk", @@ -1418,9 +1405,9 @@ dependencies = [ [[package]] name = "gix-packetline" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2592fbd36249a2fea11056f7055cc376301ef38d903d157de41998335bbf1f93" +checksum = "cd57d692b4625c2ece7634ba5d71939bbfe07bcc70eac92e10875faaf83f5316" dependencies = [ "bstr", "faster-hex", @@ -1430,9 +1417,9 @@ dependencies = [ [[package]] name = "gix-packetline-blocking" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4e706f328cd494cc8f932172e123a72b9a4711b0db5e411681432a89bd4c94" +checksum = "d10476ed5b3c9e04113e16dbee1fa7a4690279f257a74691e85372c63588c4fd" dependencies = [ "bstr", "faster-hex", @@ -1442,23 +1429,22 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.20" +version = "0.10.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d37034a4c67bbdda76f7bcd037b2f7bc0fba0c09a6662b19697a5716e7b2fd" +checksum = "0416b41cd00ff292af9b94b0660880c44bd2ed66828ddca9a2b333535cbb71b8" dependencies = [ "bstr", "gix-trace", "gix-validate", "home", - "once_cell", "thiserror 2.0.17", ] [[package]] name = "gix-pathspec" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daedead611c9bd1f3640dc90a9012b45f790201788af4d659f28d94071da7fba" +checksum = "d05e28457dca7c65a2dbe118869aab922a5bd382b7bb10cff5354f366845c128" dependencies = [ "bitflags 2.10.0", "bstr", @@ -1471,9 +1457,9 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b4b807c47ffcf7c1e5b8119585368a56449f3493da93b931e1d4239364e922" +checksum = "681901ef2f057fd1d856941f43d9f8b84a30df61f46182c0f26297b1a16f1f7f" dependencies = [ "bstr", "gix-date", @@ -1490,9 +1476,9 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a375a75b4d663e8bafe3bf4940a18a23755644c13582fa326e99f8f987d83fd" +checksum = "e912ec04b7b1566a85ad486db0cab6b9955e3e32bcd3c3a734542ab3af084c5b" dependencies = [ "bstr", "gix-utils", @@ -1501,9 +1487,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.53.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b966f578079a42f4a51413b17bce476544cca1cf605753466669082f94721758" +checksum = "b3e8559e2f6eb30785f13a689764d571d9aaf2e60603829e7504b97cae5aaaad" dependencies = [ "gix-actor", "gix-features", @@ -1522,9 +1508,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d29cae1ae31108826e7156a5e60bffacab405f4413f5bc0375e19772cce0055" +checksum = "93147960f77695ba89b72019b789679278dd4dad6a0f9a4a5bf2fd07aba56912" dependencies = [ "bstr", "gix-hash", @@ -1536,9 +1522,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f651f2b1742f760bb8161d6743229206e962b73d9c33c41f4e4aefa6586cbd3d" +checksum = "235c2338044e1e901e98cc44d669574592394212803d3956b6ac025e88963512" dependencies = [ "bitflags 2.10.0", "bstr", @@ -1554,9 +1540,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e74f91709729e099af6721bd0fa7d62f243f2005085152301ca5cdd86ec02c" +checksum = "02e2de4f91d712b1f6873477f769225fe430ffce2af8c7c85721c3ff955783b3" dependencies = [ "gix-commitgraph", "gix-date", @@ -1569,21 +1555,21 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f7053ed7c66633b56c57bc6ed3377be3166eaf3dc2df9f1c5ec446df6fdf2c" +checksum = "52e45952d0f94824e6ae7e4388b4cf9691cf50ca2ac544e3540858305a316ce7" dependencies = [ "bitflags 2.10.0", "gix-path", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "gix-shallow" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d936745103243ae4c510f19e0760ce73fb0f08096588fdbe0f0d7fb7ce8944b7" +checksum = "e2374692db1ee1ffa0eddcb9e86ec218f7c4cdceda800ebc5a9fdf73a8c08223" dependencies = [ "bstr", "gix-hash", @@ -1593,9 +1579,9 @@ dependencies = [ [[package]] name = "gix-status" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4afff9b34eeececa8bdc32b42fb318434b6b1391d9f8d45fe455af08dc2d35" +checksum = "84e01b3762e781e3d4800dfcd25140878d704b018cf792f4a0c55a1298cfdba1" dependencies = [ "bstr", "filetime", @@ -1616,9 +1602,9 @@ dependencies = [ [[package]] name = "gix-submodule" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "657cc5dd43cbc7a14d9c5aaf02cfbe9c2a15d077cded3f304adb30ef78852d3e" +checksum = "9bacc06333b50abc4fc06204622c2dd92850de2066bb5d421ac776d2bef7ae55" dependencies = [ "bstr", "gix-config", @@ -1631,29 +1617,28 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "18.0.0" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666c0041bcdedf5fa05e9bef663c897debab24b7dc1741605742412d1d47da57" +checksum = "0c413fdfca2dea768903b7ca73e46b0a8c32e4b61662c68af127bcfb7c2f7c20" dependencies = [ "dashmap", "gix-fs", "libc", - "once_cell", "parking_lot", "tempfile", ] [[package]] name = "gix-trace" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ccaf54b0b1743a695b482ca0ab9d7603744d8d10b2e5d1a332fef337bee658" +checksum = "d35bf1c8c1a883bdbb17ed1fef49be8c751a50dc3a28a2deb4234d826eddb4bb" [[package]] name = "gix-transport" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f7cc0179fc89d53c54e1f9ce51229494864ab4bf136132d69db1b011741ca3" +checksum = "bd65513315c16ec52f479858b15fc89057e5ff6342cad1ea5573789ca4448f25" dependencies = [ "bstr", "gix-command", @@ -1667,9 +1652,9 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cdc82509d792ba0ad815f86f6b469c7afe10f94362e96c4494525a6601bdd5" +checksum = "412126bade03a34f5d4125fd64878852718575b3b360eaae3b29970cb555e2a2" dependencies = [ "bitflags 2.10.0", "gix-commitgraph", @@ -1684,9 +1669,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b76a9d266254ad287ffd44467cd88e7868799b08f4d52e02d942b93e514d16f" +checksum = "788faa4421a720200c532e4377b17214963583cef7d43f0741a299f81e6b634e" dependencies = [ "bstr", "gix-features", @@ -1698,9 +1683,9 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5351af2b172caf41a3728eb4455326d84e0d70fe26fc4de74ab0bd37df4191c5" +checksum = "befcdbdfb1238d2854591f760a48711bed85e72d80a10e8f2f93f656746ef7c5" dependencies = [ "bstr", "fastrand", @@ -1709,9 +1694,9 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b9e00cacde5b51388d28ed746c493b18a6add1f19b5e01d686b3b9ece66d4d" +checksum = "5b1e63a5b516e970a594f870ed4571a8fdcb8a344e7bd407a20db8bd61dbfde4" dependencies = [ "bstr", "thiserror 2.0.17", @@ -1719,9 +1704,9 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f625ac9126c19bef06dbc6d2703cdd7987e21e35b497bb265ac37d383877b1" +checksum = "c5a40efab3eef5485365fee7b5df60732110bc3521af5e48c5cd1c153c48dae0" dependencies = [ "bstr", "gix-attributes", @@ -1769,9 +1754,7 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", + "foldhash 0.1.5", ] [[package]] @@ -1779,6 +1762,11 @@ name = "hashbrown" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", +] [[package]] name = "hashlink" @@ -2226,16 +2214,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", - "simd-adler32", -] - [[package]] name = "mockall" version = "0.13.1" @@ -3238,12 +3216,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - [[package]] name = "siphasher" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 82101910d..493ab1f6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ clap_complete_nushell = "4.5.9" dirs = "6.0.0" dunce = "1.0.5" # default feature restriction addresses https://github.com/starship/starship/issues/4251 -gix = { version = "0.73.0", default-features = false, features = ["max-performance-safe", "revision", "zlib-rs", "status"] } +gix = { version = "0.74.0", default-features = false, features = ["max-performance-safe", "revision", "zlib-rs", "status"] } indexmap = { version = "2.12.0", features = ["serde"] } jsonc-parser = { version = "0.27.0", features = ["serde"] } log = { version = "0.4.28", features = ["std"] } diff --git a/src/modules/git_status.rs b/src/modules/git_status.rs index ca7e0aa56..2904011a8 100644 --- a/src/modules/git_status.rs +++ b/src/modules/git_status.rs @@ -389,7 +389,7 @@ fn get_repo_status( use gix::status::plumbing::index_as_worktree::{Change, EntryStatus}; match change { Item::Modification { - status: EntryStatus::Conflict(_), + status: EntryStatus::Conflict { .. }, .. } => { repo_status.conflicted += 1;