From 2c61b09e91ce03830f9f19a2848803b66d0b13f7 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 10 Jan 2025 12:29:28 +0100 Subject: [PATCH 1/2] some cargo upgrades --- Cargo.lock | 278 +++++++++++++++++++++++++++------------- Cargo.toml | 10 +- asyncgit/Cargo.toml | 4 +- deny.toml | 28 +++- filetreelist/Cargo.toml | 2 +- git2-hooks/Cargo.toml | 2 +- 6 files changed, 223 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ce5d6a430..78b6078be0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,8 +185,8 @@ dependencies = [ "serial_test", "ssh-key", "tempfile", - "thiserror", - "unicode-truncate", + "thiserror 2.0.10", + "unicode-truncate 2.0.0", "url", ] @@ -320,13 +320,13 @@ dependencies = [ [[package]] name = "bugreport" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535120b8182547808081a66f1f77a64533c780b23da26763e0ee34dfb94f98c9" +checksum = "f280f65ce85b880919349bbfcb204930291251eedcb2e5f84ce2f51df969c162" dependencies = [ "git-version", "shell-escape", - "sys-info", + "sysinfo", ] [[package]] @@ -501,9 +501,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -565,7 +565,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.7.0", "crossterm_winapi", - "mio 1.0.2", + "mio", "parking_lot", "rustix", "serde", @@ -875,7 +875,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -884,7 +884,7 @@ name = "filetreelist" version = "0.5.2" dependencies = [ "pretty_assertions", - "thiserror", + "thiserror 2.0.10", ] [[package]] @@ -1101,7 +1101,7 @@ dependencies = [ "pretty_assertions", "shellexpand", "tempfile", - "thiserror", + "thiserror 2.0.10", ] [[package]] @@ -1157,7 +1157,7 @@ dependencies = [ "tui-textarea", "two-face", "unicode-segmentation", - "unicode-truncate", + "unicode-truncate 2.0.0", "unicode-width 0.2.0", "which", ] @@ -1198,7 +1198,7 @@ dependencies = [ "gix-validate", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1211,7 +1211,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror", + "thiserror 1.0.67", "winnow", ] @@ -1221,7 +1221,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f78312288bd02052be5dbc2ecbc342c9f4eb791986d86c0a5c06b92dc72efa" dependencies = [ - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1230,7 +1230,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28b58ba04f0c004722344390af9dbc85888fbb84be1981afb934da4114d4cf" dependencies = [ - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1244,7 +1244,7 @@ dependencies = [ "gix-features", "gix-hash", "memmap2", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1263,7 +1263,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.67", "unicode-bom", "winnow", ] @@ -1278,7 +1278,7 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1290,7 +1290,7 @@ dependencies = [ "bstr", "itoa", "jiff", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1302,7 +1302,7 @@ dependencies = [ "bstr", "gix-hash", "gix-object", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1318,7 +1318,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1339,7 +1339,7 @@ dependencies = [ "prodash", "sha1", "sha1_smol", - "thiserror", + "thiserror 1.0.67", "walkdir", ] @@ -1373,7 +1373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "952c3a29f1bc1007cc901abce7479943abfa42016db089de33d0a4fa3c85bfe8" dependencies = [ "faster-hex", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1412,7 +1412,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1423,7 +1423,7 @@ checksum = "5102acdf4acae2644e38dbbd18cdfba9597a218f7d85f810fe5430207e03c2de" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1442,7 +1442,7 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror", + "thiserror 1.0.67", "winnow", ] @@ -1464,7 +1464,7 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1482,7 +1482,7 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror", + "thiserror 1.0.67", "uluru", ] @@ -1496,7 +1496,7 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1507,7 +1507,7 @@ checksum = "f89f9a1525dcfd9639e282ea939f5ab0d09d93cf2b90c1fc6104f1b9582a8e49" dependencies = [ "bstr", "gix-utils", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1527,7 +1527,7 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror", + "thiserror 1.0.67", "winnow", ] @@ -1542,7 +1542,7 @@ dependencies = [ "gix-revision", "gix-validate", "smallvec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1560,7 +1560,7 @@ dependencies = [ "gix-object", "gix-revwalk", "gix-trace", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1575,7 +1575,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1623,7 +1623,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1635,7 +1635,7 @@ dependencies = [ "bstr", "gix-features", "gix-path", - "thiserror", + "thiserror 1.0.67", "url", ] @@ -1656,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e187b263461bc36cea17650141567753bc6207d036cedd1de6e81a52f277ff68" dependencies = [ "bstr", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -1727,7 +1727,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1896,9 +1896,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inotify" -version = "0.9.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ "bitflags 1.3.2", "inotify-sys", @@ -1934,6 +1934,15 @@ dependencies = [ "syn", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "invalidstring" version = "0.1.3" @@ -1966,7 +1975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" dependencies = [ "jiff-tzdb-platform", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2033,9 +2042,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.162" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libgit2-sys" @@ -2164,18 +2173,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.2" @@ -2191,32 +2188,51 @@ dependencies = [ [[package]] name = "notify" -version = "6.1.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" dependencies = [ "bitflags 2.7.0", - "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", "log", - "mio 0.8.11", + "mio", + "notify-types", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "notify-debouncer-mini" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" +checksum = "aaa5a66d07ed97dce782be94dcf5ab4d1b457f4243f7566c7557f15cabc8c799" dependencies = [ - "crossbeam-channel", "log", "notify", + "notify-types", + "tempfile", +] + +[[package]] +name = "notify-types" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174" +dependencies = [ + "instant", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", ] [[package]] @@ -2399,15 +2415,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.8", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2626,7 +2642,7 @@ dependencies = [ "serde", "strum", "unicode-segmentation", - "unicode-truncate", + "unicode-truncate 1.1.0", "unicode-width 0.2.0", ] @@ -2659,6 +2675,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +dependencies = [ + "bitflags 2.7.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -2667,7 +2692,7 @@ checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.67", ] [[package]] @@ -2971,7 +2996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 1.0.2", + "mio", "signal-hook", ] @@ -3197,18 +3222,22 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "thiserror", + "thiserror 1.0.67", "walkdir", ] [[package]] -name = "sys-info" -version = "0.9.1" +name = "sysinfo" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ - "cc", + "core-foundation-sys", "libc", + "memchr", + "ntapi", + "rayon", + "windows", ] [[package]] @@ -3222,7 +3251,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3231,7 +3260,16 @@ version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.67", +] + +[[package]] +name = "thiserror" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" +dependencies = [ + "thiserror-impl 2.0.10", ] [[package]] @@ -3245,6 +3283,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -3386,6 +3435,17 @@ dependencies = [ "unicode-width 0.1.13", ] +[[package]] +name = "unicode-truncate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fbf03860ff438702f3910ca5f28f8dac63c1c11e7efb5012b8b175493606330" +dependencies = [ + "itertools", + "unicode-segmentation", + "unicode-width 0.2.0", +] + [[package]] name = "unicode-width" version = "0.1.13" @@ -3562,6 +3622,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -3572,28 +3642,62 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.48.0" +name = "windows-core" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-targets 0.48.5", + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", ] [[package]] -name = "windows-sys" -version = "0.52.0" +name = "windows-implement" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets 0.52.6", ] diff --git a/Cargo.toml b/Cargo.toml index 9ac42571e8..348355c1bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ anyhow = "1.0" asyncgit = { path = "./asyncgit", version = "0.26", default-features = false } backtrace = "0.3" bitflags = "2.7" -bugreport = "0.5" +bugreport = "0.5.1" bwrap = { version = "1.3", features = ["use_std"] } bytesize = { version = "1.3", default-features = false } chrono = { version = "0.4", default-features = false, features = ["clock"] } @@ -34,11 +34,11 @@ gh-emoji = { version = "1.0", optional = true } indexmap = "2" itertools = "0.13" log = "0.4" -notify = "6.1" -notify-debouncer-mini = "0.4" +notify = "7" +notify-debouncer-mini = "0.5" once_cell = "1" # pin until upgrading this does not introduce a duplicate dependency -parking_lot_core = "=0.9.9" +parking_lot_core = "=0.9.10" ratatui = { version = "0.29", default-features = false, features = [ 'crossterm', 'serde', @@ -60,7 +60,7 @@ syntect = { version = "5.2", default-features = false, features = [ tui-textarea = "0.7" two-face = { version = "0.4.0", default-features = false } unicode-segmentation = "1.12" -unicode-truncate = "1.0" +unicode-truncate = "2.0" unicode-width = "0.2" which = "7.0" diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml index dc3ec963a5..b2d070646f 100644 --- a/asyncgit/Cargo.toml +++ b/asyncgit/Cargo.toml @@ -33,8 +33,8 @@ rayon-core = "1.12" scopetime = { path = "../scopetime", version = "0.1" } serde = { version = "1.0", features = ["derive"] } ssh-key = { version = "0.6.7", features = ["crypto", "encryption"] } -thiserror = "1.0" -unicode-truncate = "1.0" +thiserror = "2.0" +unicode-truncate = "2.0" url = "2.5" [dev-dependencies] diff --git a/deny.toml b/deny.toml index 445952ea7b..ed8bfaab4c 100644 --- a/deny.toml +++ b/deny.toml @@ -14,7 +14,11 @@ allow = [ version = 2 # No fix for RSA, and this is a dependency from ssh_key crate to handle rsa ssh key. # https://rustsec.org/advisories/RUSTSEC-2023-0071 -ignore = ["RUSTSEC-2023-0071"] +ignore = [ + "RUSTSEC-2023-0071", + # https://github.com/notify-rs/notify/pull/652 + "RUSTSEC-2024-0384", +] [[licenses.exceptions]] allow = ["Unicode-DFS-2016"] @@ -24,11 +28,25 @@ version = "1.0.3" [bans] multiple-versions = "deny" skip-tree = [ - { name = "bitflags" }, - # this is only needed for notify: https://github.com/notify-rs/notify/issues/648 - { name = "mio" }, + # currently needed due to: + # * `dirs-sys v0.4.1` (https://github.com/dirs-dev/dirs-sys-rs/issues/29) + { name = "windows-sys" }, # this is needed for: # `bwrap v1.3.0` (https://github.com/micl2e2/bwrap/pull/4) - # `unicode-truncate v1.1.0` (https://github.com/Aetf/unicode-truncate/pull/23) { name = "unicode-width" }, + # currently needed due to `ratatui v0.29.0` + { name = "unicode-truncate" }, + # currently needed due to: + # * `gix v0.67.0` and other gix crates + # * `redox_users v0.4.5` + # * `syntect v5.2.0` + { name = "thiserror" }, + # currently needed due to: + # * `windows v0.57.0` + # * `iana-time-zone v0.1.60` + { name = "windows-core" }, + # currently needed due to: + # * `parking_lot_core v0.9.10` + # * `filetime v0.2.23` + { name = "redox_syscall" }, ] diff --git a/filetreelist/Cargo.toml b/filetreelist/Cargo.toml index 4c0e1eede9..2ee1d96782 100644 --- a/filetreelist/Cargo.toml +++ b/filetreelist/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["gui", "cli", "terminal", "ui", "tui"] exclude = ["/demo.gif"] [dependencies] -thiserror = "1.0" +thiserror = "2.0" [dev-dependencies] pretty_assertions = "1.4" diff --git a/git2-hooks/Cargo.toml b/git2-hooks/Cargo.toml index ebc9fe8b47..749db53416 100644 --- a/git2-hooks/Cargo.toml +++ b/git2-hooks/Cargo.toml @@ -16,7 +16,7 @@ keywords = ["git"] git2 = ">=0.17" log = "0.4" shellexpand = "3.1" -thiserror = "1.0" +thiserror = "2.0" [dev-dependencies] git2-testing = { path = "../git2-testing" } From f4070b629ec6fc911c7b0a4849b197490c7d6a07 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 10 Jan 2025 12:58:29 +0100 Subject: [PATCH 2/2] gix upgrade --- Cargo.lock | 254 ++++++++++++++++++++++++++++++-------------- asyncgit/Cargo.toml | 2 +- 2 files changed, 174 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78b6078be0..5183a2b7f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1164,9 +1164,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.67.0" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d3e78ddac368d3e3bfbc2862bc2aafa3d89f1b15fed898d9761e1ec6f3f17f" +checksum = "8d0eebdaecdcf405d5433a36f85e4f058cf4de48ee2604388be0dbccbaad353e" dependencies = [ "gix-actor", "gix-commitgraph", @@ -1185,11 +1185,13 @@ dependencies = [ "gix-odb", "gix-pack", "gix-path", + "gix-protocol", "gix-ref", "gix-refspec", "gix-revision", "gix-revwalk", "gix-sec", + "gix-shallow", "gix-tempfile", "gix-trace", "gix-traverse", @@ -1198,60 +1200,72 @@ dependencies = [ "gix-validate", "once_cell", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-actor" -version = "0.33.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59226ef06661c756e664b46b1d3b2c198f6adc5407a484c086d0171108a70027" +checksum = "32b24171f514cef7bb4dfb72a0b06dacf609b33ba8ad2489d4c4559a03b7afb3" dependencies = [ "bstr", "gix-date", "gix-utils", "itoa", - "thiserror 1.0.67", + "thiserror 2.0.10", "winnow", ] [[package]] name = "gix-bitmap" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f78312288bd02052be5dbc2ecbc342c9f4eb791986d86c0a5c06b92dc72efa" +checksum = "d48b897b4bbc881aea994b4a5bbb340a04979d7be9089791304e04a9fbc66b53" dependencies = [ - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-chunk" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28b58ba04f0c004722344390af9dbc85888fbb84be1981afb934da4114d4cf" +checksum = "c6ffbeb3a5c0b8b84c3fe4133a6f8c82fa962f4caefe8d0762eced025d3eb4f7" dependencies = [ - "thiserror 1.0.67", + "thiserror 2.0.10", +] + +[[package]] +name = "gix-command" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9405c0a56e17f8365a46870cd2c7db71323ecc8bda04b50cb746ea37bd091e90" +dependencies = [ + "bstr", + "gix-path", + "gix-trace", + "shell-words", ] [[package]] name = "gix-commitgraph" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41db900b189e62dc61575f06fdf1a3b6901d264a99be9d32b286af6b2e3984e1" +checksum = "a8da6591a7868fb2b6dabddea6b09988b0b05e0213f938dbaa11a03dd7a48d85" dependencies = [ "bstr", "gix-chunk", "gix-features", "gix-hash", "memmap2", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-config" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bedd1bf1c7b994be9d57207e8e0de79016c05e2e8701d3015da906e65ac445e" +checksum = "6649b406ca1f99cb148959cf00468b231f07950f8ec438cc0903cda563606f19" dependencies = [ "bstr", "gix-config-value", @@ -1263,53 +1277,53 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", "unicode-bom", "winnow", ] [[package]] name = "gix-config-value" -version = "0.14.9" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3de3fdca9c75fa4b83a76583d265fa49b1de6b088ebcd210749c24ceeb74660" +checksum = "49aaeef5d98390a3bcf9dbc6440b520b793d1bf3ed99317dc407b02be995b28e" dependencies = [ "bitflags 2.7.0", "bstr", "gix-path", "libc", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-date" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10d543ac13c97292a15e8e8b7889cd006faf739777437ed95362504b8fe81a0" +checksum = "c57c477b645ee248b173bb1176b52dd528872f12c50375801a58aaf5ae91113f" dependencies = [ "bstr", "itoa", "jiff", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-diff" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9850fd0c15af113db6f9e130d13091ba0d3754e570a2afdff9e2f3043da260e" +checksum = "a8e92566eccbca205a0a0f96ffb0327c061e85bc5c95abbcddfe177498aa04f6" dependencies = [ "bstr", "gix-hash", "gix-object", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-discover" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c522e31f458f50af09dfb014e10873c5378f702f8049c96f508989aad59671f6" +checksum = "83bf6dfa4e266a4a9becb4d18fc801f92c3f7cc6c433dd86fdadbcf315ffb6ef" dependencies = [ "bstr", "dunce", @@ -1318,14 +1332,14 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-features" -version = "0.39.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0eb9efdf96c35c0bed7596d1bef2d4ce6360a1d09738001f9d3e402aa7ba3e" +checksum = "7d85d673f2e022a340dba4713bed77ef2cf4cd737d2f3e0f159d45e0935fd81f" dependencies = [ "crc32fast", "crossbeam-channel", @@ -1339,15 +1353,15 @@ dependencies = [ "prodash", "sha1", "sha1_smol", - "thiserror 1.0.67", + "thiserror 2.0.10", "walkdir", ] [[package]] name = "gix-fs" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34740384d8d763975858fa2c176b68652a6fcc09f616e24e3ce967b0d370e4d8" +checksum = "3b3d4fac505a621f97e5ce2c69fdc425742af00c0920363ca4074f0eb48b1db9" dependencies = [ "fastrand", "gix-features", @@ -1356,9 +1370,9 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "254b5101cf7facc00d9b5ff564cf46302ca76695cca23d33bc958a707b6fc857" +checksum = "aaf69a6bec0a3581567484bf99a4003afcaf6c469fd4214352517ea355cf3435" dependencies = [ "bitflags 2.7.0", "bstr", @@ -1368,12 +1382,12 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952c3a29f1bc1007cc901abce7479943abfa42016db089de33d0a4fa3c85bfe8" +checksum = "0b5eccc17194ed0e67d49285e4853307e4147e95407f91c1c3e4a13ba9f4e4ce" dependencies = [ "faster-hex", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] @@ -1389,9 +1403,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27619009ca1ea33fd885041273f5fa5a09163a5c1d22a913b28d7b985e66fe29" +checksum = "270645fd20556b64c8ffa1540d921b281e6994413a0ca068596f97e9367a257a" dependencies = [ "bitflags 2.7.0", "bstr", @@ -1412,7 +1426,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] @@ -1428,9 +1442,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.45.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a77b6e7753d298553d9ae8b1744924481e7a49170983938bb578dccfbc6fc1a" +checksum = "e42d58010183ef033f31088479b4eb92b44fe341b35b62d39eb8b185573d77ea" dependencies = [ "bstr", "gix-actor", @@ -1438,19 +1452,20 @@ dependencies = [ "gix-features", "gix-hash", "gix-hashtable", + "gix-path", "gix-utils", "gix-validate", "itoa", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", "winnow", ] [[package]] name = "gix-odb" -version = "0.64.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb86aadf7f1b2f980601b4fc94309706f9700f8008f935dc512d556c9e60f61" +checksum = "cb780eceb3372ee204469478de02eaa34f6ba98247df0186337e0333de97d0ae" dependencies = [ "arc-swap", "gix-date", @@ -1464,14 +1479,14 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-pack" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e6e59a855ba243672408139db68e2478126cdcfeabb420777df4a1f20026b" +checksum = "4158928929be29cae7ab97afc8e820a932071a7f39d8ba388eed2380c12c566c" dependencies = [ "clru", "gix-chunk", @@ -1482,39 +1497,70 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", "uluru", ] +[[package]] +name = "gix-packetline" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911aeea8b2dabeed2f775af9906152a1f0109787074daf9e64224e3892dde453" +dependencies = [ + "bstr", + "faster-hex", + "gix-trace", + "thiserror 2.0.10", +] + [[package]] name = "gix-path" -version = "0.10.12" +version = "0.10.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04e5a94fdb56b1e91eb7df2658ad16832428b8eeda24ff1a0f0288de2bce554" +checksum = "afc292ef1a51e340aeb0e720800338c805975724c1dfbd243185452efd8645b7" dependencies = [ "bstr", "gix-trace", "home", "once_cell", - "thiserror 1.0.67", + "thiserror 2.0.10", +] + +[[package]] +name = "gix-protocol" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84642e8b6fed7035ce9cc449593019c55b0ec1af7a5dce1ab8a0636eaaeb067" +dependencies = [ + "bstr", + "gix-date", + "gix-features", + "gix-hash", + "gix-ref", + "gix-shallow", + "gix-transport", + "gix-utils", + "maybe-async", + "thiserror 2.0.10", + "winnow", ] [[package]] name = "gix-quote" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89f9a1525dcfd9639e282ea939f5ab0d09d93cf2b90c1fc6104f1b9582a8e49" +checksum = "64a1e282216ec2ab2816cd57e6ed88f8009e634aec47562883c05ac8a7009a63" dependencies = [ "bstr", "gix-utils", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-ref" -version = "0.48.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47385e71fa2d9da8c35e642ef4648808ddf0a52bc93425879088c706dfeaea2" +checksum = "a91b61776c839d0f1b7114901179afb0947aa7f4d30793ca1c56d335dfef485f" dependencies = [ "gix-actor", "gix-features", @@ -1527,29 +1573,29 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror 1.0.67", + "thiserror 2.0.10", "winnow", ] [[package]] name = "gix-refspec" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0022038a09d80d9abf773be8efcbb502868d97f6972b8633bfb52ab6edaac442" +checksum = "00c056bb747868c7eb0aeb352c9f9181ab8ca3d0a2550f16470803500c6c413d" dependencies = [ "bstr", "gix-hash", "gix-revision", "gix-validate", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-revision" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8eb4088fece3562af4a5d751e069f90e93345524ad730512185234c4b55f1" +checksum = "61e1ddc474405a68d2ce8485705dd72fe6ce959f2f5fe718601ead5da2c8f9e7" dependencies = [ "bitflags 2.7.0", "bstr", @@ -1560,14 +1606,14 @@ dependencies = [ "gix-object", "gix-revwalk", "gix-trace", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-revwalk" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c9a9496da98d36ff19063a8576bf09a87425583b709a56dc5594fffa9d39b2" +checksum = "510026fc32f456f8f067d8f37c34088b97a36b2229d88a6a5023ef179fcb109d" dependencies = [ "gix-commitgraph", "gix-date", @@ -1575,14 +1621,14 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-sec" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2007538eda296445c07949cf04f4a767307d887184d6b3e83e2d636533ddc6e" +checksum = "a8b876ef997a955397809a2ec398d6a45b7a55b4918f2446344330f778d14fd6" dependencies = [ "bitflags 2.7.0", "gix-path", @@ -1590,6 +1636,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "gix-shallow" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2673242e87492cb6ff671f0c01f689061ca306c4020f137197f3abc84ce01" +dependencies = [ + "bstr", + "gix-hash", + "gix-lock", + "thiserror 2.0.10", +] + [[package]] name = "gix-tempfile" version = "15.0.0" @@ -1609,11 +1667,27 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952" +[[package]] +name = "gix-transport" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d91e507a8713cfa2318d5a85d75b36e53a40379cc7eb7634ce400ecacbaf" +dependencies = [ + "bstr", + "gix-command", + "gix-features", + "gix-packetline", + "gix-quote", + "gix-sec", + "gix-url", + "thiserror 2.0.10", +] + [[package]] name = "gix-traverse" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f20f1b13cc4fa6ba92b24e6aa0c2fb6a34beb4458ef88c6300212db504e818df" +checksum = "6ed47d648619e23e93f971d2bba0d10c1100e54ef95d2981d609907a8cabac89" dependencies = [ "bitflags 2.7.0", "gix-commitgraph", @@ -1623,19 +1697,20 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] name = "gix-url" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e7c297c3265015c133a2c02199610b6e1373a09dc4be057d0c1b5285737f06" +checksum = "d096fb733ba6bd3f5403dba8bd72bdd8809fe2b347b57844040b8f49c93492d9" dependencies = [ "bstr", "gix-features", "gix-path", - "thiserror 1.0.67", + "percent-encoding", + "thiserror 2.0.10", "url", ] @@ -1651,12 +1726,12 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e187b263461bc36cea17650141567753bc6207d036cedd1de6e81a52f277ff68" +checksum = "cd520d09f9f585b34b32aba1d0b36ada89ab7fefb54a8ca3fe37fc482a750937" dependencies = [ "bstr", - "thiserror 1.0.67", + "thiserror 2.0.10", ] [[package]] @@ -2149,6 +2224,17 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "maybe-async" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "memchr" version = "2.7.4" @@ -2964,6 +3050,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "shellexpand" version = "3.1.0" diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml index b2d070646f..d13aa15481 100644 --- a/asyncgit/Cargo.toml +++ b/asyncgit/Cargo.toml @@ -19,7 +19,7 @@ easy-cast = "0.5" fuzzy-matcher = "0.3" git2 = "0.19" git2-hooks = { path = "../git2-hooks", version = ">=0.4" } -gix = { version = "0.67", default-features = false, features = [ +gix = { version = "0.69.1", default-features = false, features = [ "max-performance", "revision", ] }