diff --git a/Cargo.lock b/Cargo.lock index 7870936a8..35fdcea8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1126,9 +1126,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "gix" -version = "0.61.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e0e59a44bf00de058ee98d6ecf3c9ed8f8842c1da642258ae4120d41ded8f7" +checksum = "5631c64fb4cd48eee767bf98a3cbc5c9318ef3bb71074d4c099a2371510282b6" dependencies = [ "gix-actor 0.31.1", "gix-attributes 0.22.2", @@ -1141,12 +1141,12 @@ dependencies = [ "gix-discover 0.31.0", "gix-features 0.38.1", "gix-filter", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-glob 0.16.2", "gix-hash 0.14.2", "gix-hashtable 0.5.2", "gix-ignore 0.11.2", - "gix-index 0.31.1", + "gix-index 0.32.1", "gix-lock 13.1.1", "gix-macros", "gix-mailmap", @@ -1164,11 +1164,11 @@ dependencies = [ "gix-submodule", "gix-tempfile 13.1.1", "gix-trace", - "gix-traverse 0.38.0", + "gix-traverse 0.39.0", "gix-url", "gix-utils", "gix-validate", - "gix-worktree 0.32.0", + "gix-worktree 0.33.1", "once_cell", "parking_lot 0.12.1", "smallvec", @@ -1311,9 +1311,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62129c75e4b6229fe15fb9838cdc00c655e87105b651e4edd7c183fc5288b5d1" +checksum = "7580e05996e893347ad04e1eaceb92e1c0e6a3ffe517171af99bf6b6df0ca6e5" dependencies = [ "bstr", "gix-config-value", @@ -1357,41 +1357,41 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e605593c2ef74980a534ade0909c7dc57cca72baa30cbb67d2dda621f99ac4" +checksum = "a5fbc24115b957346cd23fb0f47d830eb799c46c89cdcf2f5acc9bf2938c2d01" dependencies = [ "bstr", "gix-command", "gix-filter", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", "gix-object 0.42.1", "gix-path", "gix-tempfile 13.1.1", "gix-trace", - "gix-worktree 0.32.0", + "gix-worktree 0.33.1", "imara-diff", "thiserror", ] [[package]] name = "gix-dir" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3413ccd29130900c17574678aee640e4847909acae9febf6424dc77b782c6d32" +checksum = "3d6fcd56ffa1133f35525af890226ad0d3b2e607b4490360c94b1869e278eba3" dependencies = [ "bstr", "gix-discover 0.31.0", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-ignore 0.11.2", - "gix-index 0.31.1", + "gix-index 0.32.1", "gix-object 0.42.1", "gix-path", "gix-pathspec", "gix-trace", "gix-utils", - "gix-worktree 0.32.0", + "gix-worktree 0.33.1", "thiserror", ] @@ -1418,7 +1418,7 @@ checksum = "64bab49087ed3710caf77e473dc0efc54ca33d8ccc6441359725f121211482b1" dependencies = [ "bstr", "dunce", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", "gix-path", "gix-ref 0.43.0", @@ -1477,9 +1477,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd71bf3e64d8fb5d5635d4166ca5a36fe56b292ffff06eab1d93ea47fd5beb89" +checksum = "5c0d1f01af62bfd2fb3dd291acc2b29d4ab3e96ad52a679174626508ce98ef12" dependencies = [ "bstr", "encoding_rs", @@ -1516,9 +1516,9 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634b8a743b0aae03c1a74ee0ea24e8c5136895efac64ce52b3ea106e1c6f0613" +checksum = "e2184c40e7910529677831c8b481acf788ffd92427ed21fad65b6aa637e631b8" dependencies = [ "gix-features 0.38.1", "gix-utils", @@ -1640,9 +1640,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549621f13d9ccf325a7de45506a3266af0d08f915181c5687abb5e8669bfd2e6" +checksum = "881ab3b1fa57f497601a5add8289e72a7ae09471fc0b9bbe483b628ae8e418a1" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1650,11 +1650,11 @@ dependencies = [ "fnv", "gix-bitmap", "gix-features 0.38.1", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", "gix-lock 13.1.1", "gix-object 0.42.1", - "gix-traverse 0.38.0", + "gix-traverse 0.39.0", "gix-utils", "hashbrown 0.14.3", "itoa", @@ -1780,14 +1780,14 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.59.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b55378c719693380f66d9dd21ce46721eed2981d8789fc698ec1ada6fa176e" +checksum = "e8bbb43d2fefdc4701ffdf9224844d05b136ae1b9a73c2f90710c8dd27a93503" dependencies = [ "arc-swap", "gix-date", "gix-features 0.38.1", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", "gix-object 0.42.1", "gix-pack", @@ -1800,9 +1800,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6391aeaa030ad64aba346a9f5c69bb1c4e5c6fb4411705b03b40b49d8614ec30" +checksum = "b58bad27c7677fa6b587aab3a1aca0b6c97373bd371a0a4290677c838c9bcaf1" dependencies = [ "clru", "gix-chunk", @@ -1821,9 +1821,9 @@ dependencies = [ [[package]] name = "gix-packetline-blocking" -version = "0.17.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8ef6dd3ea50e26f3bf572e90c034d033c804d340cd1eb386392f184a9ba2f7" +checksum = "c31d42378a3d284732e4d589979930d0d253360eccf7ec7a80332e5ccb77e14a" dependencies = [ "bstr", "faster-hex", @@ -1846,9 +1846,9 @@ dependencies = [ [[package]] name = "gix-pathspec" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d479789f3abd10f68a709454ce04cd68b54092ee882c8622ae3aa1bb9bf8496c" +checksum = "ea9f934a111e0efdf93ae06e3648427e60e783099fbebd6a53a7a2ffb10a1e65" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1900,7 +1900,7 @@ dependencies = [ "gix-actor 0.31.1", "gix-date", "gix-features 0.38.1", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", "gix-lock 13.1.1", "gix-object 0.42.1", @@ -1987,9 +1987,9 @@ dependencies = [ [[package]] name = "gix-status" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca216db89947eca709f69ec5851aa76f9628e7c7aab7aa5a927d0c619d046bf2" +checksum = "50c413bfd2952e4ee92e48438dac3c696f3555e586a34d184a427f6bedd1e4f9" dependencies = [ "bstr", "filetime", @@ -1997,13 +1997,13 @@ dependencies = [ "gix-dir", "gix-features 0.38.1", "gix-filter", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-hash 0.14.2", - "gix-index 0.31.1", + "gix-index 0.32.1", "gix-object 0.42.1", "gix-path", "gix-pathspec", - "gix-worktree 0.32.0", + "gix-worktree 0.33.1", "thiserror", ] @@ -2057,7 +2057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a761d76594f4443b675e85928e4902dec333273836bd386906f01e7e346a0d11" dependencies = [ "dashmap 5.5.3", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "libc", "once_cell", "parking_lot 0.12.1", @@ -2092,9 +2092,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b838b2db8f62c9447d483a4c28d251b67fee32741a82cb4d35e9eb4e9fdc5ab" +checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" [[package]] name = "gix-traverse" @@ -2114,10 +2114,11 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95aef84bc777025403a09788b1e4815c06a19332e9e5d87a955e1ed7da9bf0cf" +checksum = "f4029ec209b0cc480d209da3837a42c63801dd8548f09c1f4502c60accb62aeb" dependencies = [ + "bitflags 2.4.1", "gix-commitgraph 0.24.2", "gix-date", "gix-hash 0.14.2", @@ -2130,9 +2131,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0b24f3ecc79a5a53539de9c2e99425d0ef23feacdcf3faac983aa9a2f26849" +checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf" dependencies = [ "bstr", "gix-features 0.38.1", @@ -2144,9 +2145,9 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92" +checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" dependencies = [ "bstr", "fastrand", @@ -2183,18 +2184,18 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.32.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe78e03af9eec168eb187e05463a981c57f0a915f64b1788685a776bd2ef969c" +checksum = "f06ca5dd164678914fc9280ba9d1ffeb66499ccc16ab1278c513828beee88401" dependencies = [ "bstr", "gix-attributes 0.22.2", "gix-features 0.38.1", - "gix-fs 0.10.1", + "gix-fs 0.10.2", "gix-glob 0.16.2", "gix-hash 0.14.2", "gix-ignore 0.11.2", - "gix-index 0.31.1", + "gix-index 0.32.1", "gix-object 0.42.1", "gix-path", ] diff --git a/Cargo.toml b/Cargo.toml index d250e42e4..a2b33058b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ bytecount = "0.6.7" clap.workspace = true clap_complete = "4.5.1" crossbeam-channel = "0.5.9" -gix = { version = "0.61.0", default-features = false, features = [ +gix = { version = "0.62.0", default-features = false, features = [ "max-performance-safe", "blob-diff", "mailmap", diff --git a/src/info/git/mod.rs b/src/info/git/mod.rs index 753dac119..7c7591ad3 100644 --- a/src/info/git/mod.rs +++ b/src/info/git/mod.rs @@ -7,7 +7,7 @@ use gix::bstr::{BString, Utf8Error}; use gix::object::tree::diff::change::Event; use gix::object::tree::diff::Action; use gix::prelude::ObjectIdExt; -use gix::traverse::commit::Sorting; +use gix::traverse::commit::simple::Sorting; use gix::{Commit, ObjectId}; use regex::Regex; use std::collections::HashMap;