diff --git a/Cargo.lock b/Cargo.lock index bb6940c8c5..810e22ad86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,12 +79,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -145,9 +139,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "arc-swap" @@ -165,7 +159,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" name = "asyncgit" version = "0.27.0" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "crossbeam-channel", "dirs", "easy-cast", @@ -185,7 +179,7 @@ dependencies = [ "serial_test", "ssh-key", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.16", "unicode-truncate 2.0.0", "url", ] @@ -272,9 +266,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" dependencies = [ "serde", ] @@ -309,9 +303,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "regex-automata", @@ -410,11 +404,10 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "num-traits", "windows-link", @@ -432,18 +425,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.38" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.38" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" dependencies = [ "anstream", "anstyle", @@ -563,7 +556,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "crossterm_winapi", "mio", "parking_lot", @@ -942,7 +935,7 @@ name = "filetreelist" version = "0.5.2" dependencies = [ "pretty_assertions", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1146,7 +1139,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "libc", "libgit2-sys", "log", @@ -1166,7 +1159,7 @@ dependencies = [ "pretty_assertions", "shellexpand", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1187,7 +1180,7 @@ dependencies = [ "asyncgit", "backtrace", "base64", - "bitflags 2.9.1", + "bitflags 2.9.4", "bugreport", "bwrap", "bytesize", @@ -1272,11 +1265,11 @@ dependencies = [ "gix-traverse", "gix-url", "gix-utils", - "gix-validate", + "gix-validate 0.9.4", "gix-worktree", "once_cell", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1289,7 +1282,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror 2.0.12", + "thiserror 2.0.16", "winnow", ] @@ -1306,7 +1299,7 @@ dependencies = [ "gix-trace", "kstring", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", "unicode-bom", ] @@ -1316,7 +1309,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1db9765c69502650da68f0804e3dc2b5f8ccc6a2d104ca6c85bc40700d37540" dependencies = [ - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1325,7 +1318,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f" dependencies = [ - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1351,7 +1344,7 @@ dependencies = [ "gix-chunk", "gix-hash", "memmap2", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1370,7 +1363,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", "unicode-bom", "winnow", ] @@ -1381,11 +1374,11 @@ version = "0.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc2c844c4cf141884678cabef736fd91dd73068b9146e6f004ba1a0457944b6" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "bstr", "gix-path", "libc", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1397,7 +1390,7 @@ dependencies = [ "bstr", "itoa", "jiff", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1421,7 +1414,7 @@ dependencies = [ "gix-traverse", "gix-worktree", "imara-diff", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1441,7 +1434,7 @@ dependencies = [ "gix-trace", "gix-utils", "gix-worktree", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1457,7 +1450,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1476,7 +1469,7 @@ dependencies = [ "once_cell", "parking_lot", "prodash", - "thiserror 2.0.12", + "thiserror 2.0.16", "walkdir", ] @@ -1498,7 +1491,7 @@ dependencies = [ "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1512,7 +1505,7 @@ dependencies = [ "gix-features", "gix-path", "gix-utils", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1521,7 +1514,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20972499c03473e773a2099e5fd0c695b9b72465837797a51a43391a1635a030" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "bstr", "gix-features", "gix-path", @@ -1536,7 +1529,7 @@ dependencies = [ "faster-hex", "gix-features", "sha1-checked", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1569,7 +1562,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "855bece2d4153453aa5d0a80d51deea1ce8cd6a3b4cf213da85ac344ccb908a7" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "bstr", "filetime", "fnv", @@ -1581,14 +1574,14 @@ dependencies = [ "gix-object", "gix-traverse", "gix-utils", - "gix-validate", + "gix-validate 0.9.4", "hashbrown 0.14.5", "itoa", "libc", "memmap2", "rustix", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1599,7 +1592,7 @@ checksum = "df47b8f11c34520db5541bc5fc9fbc8e4b0bdfcec3736af89ccb1a5728a0126f" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1611,7 +1604,7 @@ dependencies = [ "bstr", "gix-actor", "gix-date", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1628,10 +1621,10 @@ dependencies = [ "gix-hashtable", "gix-path", "gix-utils", - "gix-validate", + "gix-validate 0.9.4", "itoa", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", "winnow", ] @@ -1653,7 +1646,7 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1671,7 +1664,7 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", "uluru", ] @@ -1684,7 +1677,7 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1696,20 +1689,21 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] name = "gix-path" -version = "0.10.15" +version = "0.10.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f910668e2f6b2a55ff35a1f04df88a1a049f7b868507f4cbeeaa220eaba7be87" +checksum = "567f65fec4ef10dfab97ae71f26a27fd4d7fe7b8e3f90c8a58551c41ff3fb65b" dependencies = [ "bstr", "gix-trace", + "gix-validate 0.10.0", "home", "once_cell", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1718,13 +1712,13 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fef8422c3c9066d649074b24025125963f85232bfad32d6d16aea9453b82ec14" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "bstr", "gix-attributes", "gix-config-value", "gix-glob", "gix-path", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1742,7 +1736,7 @@ dependencies = [ "gix-transport", "gix-utils", "maybe-async", - "thiserror 2.0.12", + "thiserror 2.0.16", "winnow", ] @@ -1754,7 +1748,7 @@ checksum = "1b005c550bf84de3b24aa5e540a23e6146a1c01c7d30470e35d75a12f827f969" dependencies = [ "bstr", "gix-utils", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1772,9 +1766,9 @@ dependencies = [ "gix-path", "gix-tempfile", "gix-utils", - "gix-validate", + "gix-validate 0.9.4", "memmap2", - "thiserror 2.0.12", + "thiserror 2.0.16", "winnow", ] @@ -1787,9 +1781,9 @@ dependencies = [ "bstr", "gix-hash", "gix-revision", - "gix-validate", + "gix-validate 0.9.4", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1798,7 +1792,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "342caa4e158df3020cadf62f656307c3948fe4eacfdf67171d7212811860c3e9" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "bstr", "gix-commitgraph", "gix-date", @@ -1807,7 +1801,7 @@ dependencies = [ "gix-object", "gix-revwalk", "gix-trace", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1822,7 +1816,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1831,7 +1825,7 @@ version = "0.10.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47aeb0f13de9ef2f3033f5ff218de30f44db827ac9f1286f9ef050aacddd5888" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "gix-path", "libc", "windows-sys 0.52.0", @@ -1846,7 +1840,7 @@ dependencies = [ "bstr", "gix-hash", "gix-lock", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1869,7 +1863,7 @@ dependencies = [ "gix-pathspec", "gix-worktree", "portable-atomic", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1884,7 +1878,7 @@ dependencies = [ "gix-pathspec", "gix-refspec", "gix-url", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1920,7 +1914,7 @@ dependencies = [ "gix-quote", "gix-sec", "gix-url", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1929,7 +1923,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36c0b049f8bdb61b20016694102f7b507f2e1727e83e9c5e6dad4f7d84ff7384" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "gix-commitgraph", "gix-date", "gix-hash", @@ -1937,7 +1931,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -1950,7 +1944,7 @@ dependencies = [ "gix-features", "gix-path", "percent-encoding", - "thiserror 2.0.12", + "thiserror 2.0.16", "url", ] @@ -1972,7 +1966,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34b5f1253109da6c79ed7cf6e1e38437080bb6d704c76af14c93e2f255234084" dependencies = [ "bstr", - "thiserror 2.0.12", + "thiserror 2.0.16", +] + +[[package]] +name = "gix-validate" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b9e00cacde5b51388d28ed746c493b18a6add1f19b5e01d686b3b9ece66d4d" +dependencies = [ + "bstr", + "thiserror 2.0.16", ] [[package]] @@ -1991,7 +1995,7 @@ dependencies = [ "gix-index", "gix-object", "gix-path", - "gix-validate", + "gix-validate 0.9.4", ] [[package]] @@ -2249,7 +2253,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "inotify-sys", "libc", ] @@ -2450,7 +2454,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "libc", "redox_syscall", ] @@ -2515,9 +2519,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru" @@ -2581,7 +2585,7 @@ version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "filetime", "fsevent-sys", "inotify", @@ -2734,9 +2738,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.108" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", @@ -2801,9 +2805,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", @@ -3056,7 +3060,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "cassowary", "compact_str", "crossterm", @@ -3098,7 +3102,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", ] [[package]] @@ -3109,7 +3113,7 @@ checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ "getrandom", "libredox", - "thiserror 2.0.12", + "thiserror 2.0.16", ] [[package]] @@ -3158,7 +3162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f" dependencies = [ "base64", - "bitflags 2.9.1", + "bitflags 2.9.4", "serde", "serde_derive", "unicode-ident", @@ -3206,7 +3210,7 @@ version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.9.4", "errno", "libc", "linux-raw-sys", @@ -3284,18 +3288,28 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.225" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.225" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" dependencies = [ "proc-macro2", "quote", @@ -3685,11 +3699,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.16", ] [[package]] @@ -3705,9 +3719,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", @@ -4097,9 +4111,9 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-result" diff --git a/Cargo.toml b/Cargo.toml index bdb5633510..9635b3e554 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,9 @@ vendor-openssl = ["asyncgit/vendor-openssl"] [dependencies] anyhow = "1.0" asyncgit = { path = "./asyncgit", version = "0.27.0", default-features = false } -backtrace = "0.3" +# 2025-09-18 backtrace >=0.3.75 requires Rust 1.82.0 while we’re still at +# 1.81.0. +backtrace = "=0.3.74" base64 = "0.22" bitflags = "2.9" bugreport = "0.5.1" @@ -58,7 +60,7 @@ notify = "8" notify-debouncer-mini = "0.6" once_cell = "1" # pin until upgrading this does not introduce a duplicate dependency -parking_lot_core = "=0.9.10" +parking_lot_core = "=0.9.11" ratatui = { version = "0.29", default-features = false, features = [ 'crossterm', 'serde', diff --git a/asyncgit/src/asyncjob/mod.rs b/asyncgit/src/asyncjob/mod.rs index 19058f9bac..2f6d31f5f0 100644 --- a/asyncgit/src/asyncjob/mod.rs +++ b/asyncgit/src/asyncjob/mod.rs @@ -130,7 +130,7 @@ impl AsyncSingleJob { let self_clone = (*self).clone(); rayon_core::spawn(move || { if let Err(e) = self_clone.run_job(task) { - log::error!("async job error: {}", e); + log::error!("async job error: {e}"); } }); diff --git a/asyncgit/src/blame.rs b/asyncgit/src/blame.rs index dcbb93aff0..6bf4afe358 100644 --- a/asyncgit/src/blame.rs +++ b/asyncgit/src/blame.rs @@ -116,7 +116,7 @@ impl AsyncBlame { let notify = match notify { Err(err) => { - log::error!("get_blame_helper error: {}", err); + log::error!("get_blame_helper error: {err}"); true } Ok(notify) => notify, diff --git a/asyncgit/src/commit_files.rs b/asyncgit/src/commit_files.rs index b2c3da1ec9..a1945b55f8 100644 --- a/asyncgit/src/commit_files.rs +++ b/asyncgit/src/commit_files.rs @@ -89,7 +89,7 @@ impl AsyncCommitFiles { return Ok(()); } - log::trace!("request: {:?}", params); + log::trace!("request: {params:?}"); { let current = self.current.lock()?; diff --git a/asyncgit/src/diff.rs b/asyncgit/src/diff.rs index 5316e67b2b..40f9a43559 100644 --- a/asyncgit/src/diff.rs +++ b/asyncgit/src/diff.rs @@ -98,7 +98,7 @@ impl AsyncDiff { &self, params: DiffParams, ) -> Result> { - log::trace!("request {:?}", params); + log::trace!("request {params:?}"); let hash = hash(¶ms); @@ -132,7 +132,7 @@ impl AsyncDiff { let notify = match notify { Err(err) => { - log::error!("get_diff_helper error: {}", err); + log::error!("get_diff_helper error: {err}"); true } Ok(notify) => notify, diff --git a/asyncgit/src/pull.rs b/asyncgit/src/pull.rs index 3ba88d6091..90a146b8c8 100644 --- a/asyncgit/src/pull.rs +++ b/asyncgit/src/pull.rs @@ -153,7 +153,7 @@ impl AsyncPull { *last_res = match res { Ok(bytes) => Some((bytes, String::new())), Err(e) => { - log::error!("fetch error: {}", e); + log::error!("fetch error: {e}"); Some((0, e.to_string())) } }; diff --git a/asyncgit/src/push.rs b/asyncgit/src/push.rs index e969689292..863abfac51 100644 --- a/asyncgit/src/push.rs +++ b/asyncgit/src/push.rs @@ -164,7 +164,7 @@ impl AsyncPush { *last_res = match res { Ok(()) => None, Err(e) => { - log::error!("push error: {}", e); + log::error!("push error: {e}"); Some(e.to_string()) } }; diff --git a/asyncgit/src/push_tags.rs b/asyncgit/src/push_tags.rs index 0984e2ae23..a294a51060 100644 --- a/asyncgit/src/push_tags.rs +++ b/asyncgit/src/push_tags.rs @@ -147,7 +147,7 @@ impl AsyncPushTags { *last_res = match res { Ok(()) => None, Err(e) => { - log::error!("push error: {}", e); + log::error!("push error: {e}"); Some(e.to_string()) } }; diff --git a/asyncgit/src/remote_progress.rs b/asyncgit/src/remote_progress.rs index 2e84f6bd8b..19dcf71ed2 100644 --- a/asyncgit/src/remote_progress.rs +++ b/asyncgit/src/remote_progress.rs @@ -96,8 +96,7 @@ impl RemoteProgress { } Err(e) => { log::error!( - "remote progress receiver error: {}", - e + "remote progress receiver error: {e}" ); break; } diff --git a/asyncgit/src/status.rs b/asyncgit/src/status.rs index 52f57fb9ff..749272fe00 100644 --- a/asyncgit/src/status.rs +++ b/asyncgit/src/status.rs @@ -135,7 +135,7 @@ impl AsyncStatus { &arc_current, &arc_last, ) { - log::error!("fetch_helper: {}", e); + log::error!("fetch_helper: {e}"); } arc_pending.fetch_sub(1, Ordering::Relaxed); @@ -158,9 +158,7 @@ impl AsyncStatus { ) -> Result<()> { let res = Self::get_status(repo, status_type, config)?; log::trace!( - "status fetched: {} (type: {:?})", - hash_request, - status_type, + "status fetched: {hash_request} (type: {status_type:?})", ); { diff --git a/asyncgit/src/sync/remotes/callbacks.rs b/asyncgit/src/sync/remotes/callbacks.rs index 76e260a8d4..ed027502b0 100644 --- a/asyncgit/src/sync/remotes/callbacks.rs +++ b/asyncgit/src/sync/remotes/callbacks.rs @@ -107,11 +107,7 @@ impl Callbacks { reference: &str, msg: Option<&str>, ) { - log::debug!( - "push_update_reference: '{}' {:?}", - reference, - msg - ); + log::debug!("push_update_reference: '{reference}' {msg:?}"); if let Ok(mut stats) = self.stats.lock() { stats.push_rejected_msg = msg @@ -125,7 +121,7 @@ impl Callbacks { total: usize, current: usize, ) { - log::debug!("packing: {:?} - {}/{}", stage, current, total); + log::debug!("packing: {stage:?} - {current}/{total}"); self.sender.clone().map(|sender| { sender.send(ProgressNotification::Packing { stage, @@ -150,7 +146,7 @@ impl Callbacks { } fn update_tips(&self, name: &str, a: git2::Oid, b: git2::Oid) { - log::debug!("update tips: '{}' [{}] [{}]", name, a, b); + log::debug!("update tips: '{name}' [{a}] [{b}]"); self.sender.clone().map(|sender| { sender.send(ProgressNotification::UpdateTips { name: name.to_string(), @@ -166,7 +162,7 @@ impl Callbacks { total: usize, bytes: usize, ) { - log::debug!("progress: {}/{} ({} B)", current, total, bytes,); + log::debug!("progress: {current}/{total} ({bytes} B)",); self.sender.clone().map(|sender| { sender.send(ProgressNotification::PushTransfer { current, @@ -187,10 +183,7 @@ impl Callbacks { allowed_types: git2::CredentialType, ) -> std::result::Result { log::debug!( - "creds: '{}' {:?} ({:?})", - url, - username_from_url, - allowed_types + "creds: '{url}' {username_from_url:?} ({allowed_types:?})" ); // This boolean is used to avoid multiple calls to credentials callback. diff --git a/asyncgit/src/sync/state.rs b/asyncgit/src/sync/state.rs index ffa0918728..2098f839f3 100644 --- a/asyncgit/src/sync/state.rs +++ b/asyncgit/src/sync/state.rs @@ -26,7 +26,7 @@ impl From for RepoState { RepositoryState::Revert => Self::Revert, RepositoryState::RebaseMerge => Self::Rebase, _ => { - log::warn!("state not supported yet: {:?}", state); + log::warn!("state not supported yet: {state:?}"); Self::Other } } diff --git a/asyncgit/src/sync/submodules.rs b/asyncgit/src/sync/submodules.rs index f984ac0b19..8da521d298 100644 --- a/asyncgit/src/sync/submodules.rs +++ b/asyncgit/src/sync/submodules.rs @@ -115,11 +115,11 @@ pub fn submodule_parent_info( let repo = repo(repo_path)?; let repo_wd = work_dir(&repo)?.to_path_buf(); - log::trace!("[sub] repo_wd: {:?}", repo_wd); + log::trace!("[sub] repo_wd: {repo_wd:?}"); log::trace!("[sub] repo_path: {:?}", repo.path()); if let Some(parent_path) = repo_wd.parent() { - log::trace!("[sub] parent_path: {:?}", parent_path); + log::trace!("[sub] parent_path: {parent_path:?}"); if let Ok(parent) = Repository::open_ext( parent_path, @@ -127,14 +127,14 @@ pub fn submodule_parent_info( Vec::<&Path>::new(), ) { let parent_wd = work_dir(&parent)?.to_path_buf(); - log::trace!("[sub] parent_wd: {:?}", parent_wd); + log::trace!("[sub] parent_wd: {parent_wd:?}"); let submodule_name = repo_wd .strip_prefix(parent_wd)? .to_string_lossy() .to_string(); - log::trace!("[sub] submodule_name: {:?}", submodule_name); + log::trace!("[sub] submodule_name: {submodule_name:?}"); if let Ok(submodule) = parent.find_submodule(&submodule_name) diff --git a/src/app.rs b/src/app.rs index 68d2987c6f..6afd19cac9 100644 --- a/src/app.rs +++ b/src/app.rs @@ -285,7 +285,7 @@ impl App { /// pub fn event(&mut self, ev: InputEvent) -> Result<()> { - log::trace!("event: {:?}", ev); + log::trace!("event: {ev:?}"); if let InputEvent::Input(ev) = ev { if self.check_hard_exit(&ev) || self.check_quit(&ev) { @@ -402,7 +402,7 @@ impl App { &mut self, ev: AsyncNotification, ) -> Result<()> { - log::trace!("update_async: {:?}", ev); + log::trace!("update_async: {ev:?}"); if let AsyncNotification::Git(ev) = ev { self.status_tab.update_git(ev)?; @@ -1061,7 +1061,7 @@ impl App { )); } Err(e) => { - log::error!("delete remote: {}", e,); + log::error!("delete remote: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("delete remote error:\n{e}",), )); diff --git a/src/input.rs b/src/input.rs index 3ef7c0414b..66cde14488 100644 --- a/src/input.rs +++ b/src/input.rs @@ -54,7 +54,7 @@ impl Input { if let Err(e) = Self::input_loop(&arc_desired, &arc_current, &tx) { - log::error!("input thread error: {}", e); + log::error!("input thread error: {e}"); arc_aborted.store(true, Ordering::SeqCst); } }); diff --git a/src/main.rs b/src/main.rs index de1e6afce1..c6512c7112 100644 --- a/src/main.rs +++ b/src/main.rs @@ -343,7 +343,7 @@ fn draw(terminal: &mut Terminal, app: &App) -> io::Result<()> { terminal.draw(|f| { if let Err(e) = app.draw(f) { - log::error!("failed to draw: {:?}", e); + log::error!("failed to draw: {e:?}"); } })?; diff --git a/src/options.rs b/src/options.rs index 38e7ac1bfe..84063e6970 100644 --- a/src/options.rs +++ b/src/options.rs @@ -139,7 +139,7 @@ impl Options { fn save(&self) { if let Err(e) = self.save_failable() { - log::error!("options save error: {}", e); + log::error!("options save error: {e}"); } } diff --git a/src/popups/commit.rs b/src/popups/commit.rs index 008fc6f8a7..146286f832 100644 --- a/src/popups/commit.rs +++ b/src/popups/commit.rs @@ -240,7 +240,7 @@ impl CommitPopup { if let HookResult::NotOk(e) = sync::hooks_pre_commit(&self.repo.borrow())? { - log::error!("pre-commit hook error: {}", e); + log::error!("pre-commit hook error: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( format!("pre-commit hook error:\n{e}"), )); @@ -256,7 +256,7 @@ impl CommitPopup { if let HookResult::NotOk(e) = sync::hooks_commit_msg(&self.repo.borrow(), &mut msg)? { - log::error!("commit-msg hook error: {}", e); + log::error!("commit-msg hook error: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( format!("commit-msg hook error:\n{e}"), )); @@ -268,7 +268,7 @@ impl CommitPopup { if let HookResult::NotOk(e) = sync::hooks_post_commit(&self.repo.borrow())? { - log::error!("post-commit hook error: {}", e); + log::error!("post-commit hook error: {e}"); self.queue.push(InternalEvent::ShowErrorMsg(format!( "post-commit hook error:\n{e}" ))); @@ -400,7 +400,7 @@ impl CommitPopup { "commit.template", ) .map_err(|e| { - log::error!("load git-config failed: {}", e); + log::error!("load git-config failed: {e}"); e }) .ok() @@ -415,7 +415,7 @@ impl CommitPopup { .and_then(|path| { read_to_string(&path) .map_err(|e| { - log::error!("read commit.template failed: {e} (path: '{:?}')",path); + log::error!("read commit.template failed: {e} (path: '{path:?}')"); e }) .ok() diff --git a/src/popups/create_branch.rs b/src/popups/create_branch.rs index ed69d392ae..5f4ea1e525 100644 --- a/src/popups/create_branch.rs +++ b/src/popups/create_branch.rs @@ -129,7 +129,7 @@ impl CreateBranchPopup { )); } Err(e) => { - log::error!("create branch: {}", e,); + log::error!("create branch: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("create branch error:\n{e}",), )); diff --git a/src/popups/create_remote.rs b/src/popups/create_remote.rs index 8e464931e8..77178c2b6f 100644 --- a/src/popups/create_remote.rs +++ b/src/popups/create_remote.rs @@ -200,7 +200,7 @@ impl CreateRemotePopup { )); } Err(e) => { - log::error!("create remote: {}", e,); + log::error!("create remote: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("create remote error:\n{e}",), )); diff --git a/src/popups/pull.rs b/src/popups/pull.rs index fbe1abda09..ffd73b1aff 100644 --- a/src/popups/pull.rs +++ b/src/popups/pull.rs @@ -153,7 +153,7 @@ impl PullPopup { &self.branch, ); if let Err(err) = ff_res { - log::trace!("ff failed: {}", err); + log::trace!("ff failed: {err}"); self.confirm_merge(branch_compare.behind); } } diff --git a/src/popups/rename_branch.rs b/src/popups/rename_branch.rs index bf8e7974f0..3f9c6b226b 100644 --- a/src/popups/rename_branch.rs +++ b/src/popups/rename_branch.rs @@ -138,7 +138,7 @@ impl RenameBranchPopup { self.queue.push(InternalEvent::SelectBranch); } Err(e) => { - log::error!("create branch: {}", e,); + log::error!("create branch: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("rename branch error:\n{e}",), )); diff --git a/src/popups/rename_remote.rs b/src/popups/rename_remote.rs index fc88389a84..e3f2714282 100644 --- a/src/popups/rename_remote.rs +++ b/src/popups/rename_remote.rs @@ -161,7 +161,7 @@ impl RenameRemotePopup { )); } Err(e) => { - log::error!("rename remote: {}", e,); + log::error!("rename remote: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("rename remote error:\n{e}",), )); diff --git a/src/popups/tag_commit.rs b/src/popups/tag_commit.rs index 696aba171c..d81173646e 100644 --- a/src/popups/tag_commit.rs +++ b/src/popups/tag_commit.rs @@ -194,7 +194,7 @@ impl TagCommitPopup { self.input.set_text(tag_name); self.hide(); - log::error!("e: {}", e,); + log::error!("e: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("tag error:\n{e}",), )); diff --git a/src/popups/update_remote_url.rs b/src/popups/update_remote_url.rs index 7a6956bb3e..1cd57cb842 100644 --- a/src/popups/update_remote_url.rs +++ b/src/popups/update_remote_url.rs @@ -138,7 +138,7 @@ impl UpdateRemoteUrlPopup { )); } Err(e) => { - log::error!("update remote url: {}", e,); + log::error!("update remote url: {e}",); self.queue.push(InternalEvent::ShowErrorMsg( format!("update remote url error:\n{e}",), )); diff --git a/src/tabs/revlog.rs b/src/tabs/revlog.rs index 74f7d1b0cc..9200c93f00 100644 --- a/src/tabs/revlog.rs +++ b/src/tabs/revlog.rs @@ -250,7 +250,7 @@ impl Revlog { self.search, LogSearch::Off | LogSearch::Results(_) ) { - log::info!("start search: {:?}", options); + log::info!("start search: {options:?}"); let filter = filter_commit_by_search( LogFilterSearch::new(options.clone()), diff --git a/src/ui/style.rs b/src/ui/style.rs index 524a14aa28..eb7116beda 100644 --- a/src/ui/style.rs +++ b/src/ui/style.rs @@ -313,7 +313,7 @@ impl Theme { let mut theme = Self::default(); if let Ok(patch) = Self::load_patch(theme_path).map_err(|e| { - log::error!("theme error [{:?}]: {e}", theme_path); + log::error!("theme error [{theme_path:?}]: {e}"); e }) { theme.apply(patch); @@ -323,13 +323,11 @@ impl Theme { if theme.save_patch(theme_path).is_ok() { log::info!( - "Converted old theme to new format. ({:?})", - theme_path + "Converted old theme to new format. ({theme_path:?})" ); } else { log::warn!( - "Failed to save theme in new format. ({:?})", - theme_path + "Failed to save theme in new format. ({theme_path:?})" ); } } diff --git a/src/ui/syntax_text.rs b/src/ui/syntax_text.rs index 057f9e3588..5ad551e3ad 100644 --- a/src/ui/syntax_text.rs +++ b/src/ui/syntax_text.rs @@ -129,7 +129,7 @@ impl SyntaxText { let ops = state .parse_line(line, &SYNTAX_SET) .map_err(|e| { - log::error!("syntax error: {:?}", e); + log::error!("syntax error: {e:?}"); asyncgit::Error::Generic( "syntax error".to_string(), ) diff --git a/src/watcher.rs b/src/watcher.rs index 9c557b92bb..ea30c7f135 100644 --- a/src/watcher.rs +++ b/src/watcher.rs @@ -30,7 +30,7 @@ impl RepoWatcher { thread::spawn(move || { if let Err(e) = Self::forwarder(&rx, &out_tx) { //maybe we need to restart the forwarder now? - log::error!("notify receive error: {}", e); + log::error!("notify receive error: {e}"); } }); @@ -53,7 +53,7 @@ impl RepoWatcher { log::debug!("notify events: {}", ev.len()); for (idx, ev) in ev.iter().enumerate() { - log::debug!("notify [{}]: {:?}", idx, ev); + log::debug!("notify [{idx}]: {ev:?}"); } if !ev.is_empty() {