some cargo upgrades (#2471)

This commit is contained in:
extrawurst 2025-01-10 12:55:30 +01:00 committed by GitHub
parent 69fdf90f39
commit d72617f5c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 223 additions and 101 deletions

278
Cargo.lock generated
View file

@ -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"
@ -3571,6 +3641,49 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-core"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
dependencies = [
"windows-implement",
"windows-interface",
"windows-result",
"windows-targets 0.52.6",
]
[[package]]
name = "windows-implement"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
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.48.0"
@ -3589,15 +3702,6 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-targets"
version = "0.48.5"

View file

@ -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"

View file

@ -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]

View file

@ -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" },
]

View file

@ -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"

View file

@ -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" }