diff --git a/Cargo.lock b/Cargo.lock index 56d19f5e..69dffc44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1047,43 +1047,44 @@ dependencies = [ [[package]] name = "gix" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99368b48a2f68c3fdc26e62c6425bdc4baeb4f30a4f24eb2e0904d29a2ba97ab" +checksum = "10f5281c55e0a7415877d91a15fae4a10ec7444615d64d78e48c07f20bcfcd9b" dependencies = [ - "gix-actor 0.21.0", - "gix-attributes 0.13.1", + "gix-actor 0.22.0", + "gix-attributes 0.14.0", "gix-commitgraph", "gix-config", "gix-credentials", - "gix-date", + "gix-date 0.6.0", "gix-diff", - "gix-discover 0.19.0", - "gix-features 0.30.0", - "gix-fs 0.2.0", - "gix-glob 0.8.0", + "gix-discover 0.20.0", + "gix-features 0.31.0", + "gix-fs 0.3.0", + "gix-glob 0.9.0", "gix-hash", "gix-hashtable", - "gix-ignore 0.3.0", - "gix-index 0.18.0", - "gix-lock 6.0.0", + "gix-ignore 0.4.0", + "gix-index 0.19.0", + "gix-lock 7.0.0", "gix-mailmap", "gix-negotiate", - "gix-object 0.30.0", + "gix-object 0.31.0", "gix-odb", "gix-pack", "gix-path", "gix-prompt", - "gix-ref 0.30.0", + "gix-ref 0.31.0", "gix-refspec", "gix-revision", "gix-sec", - "gix-tempfile 6.0.0", - "gix-traverse 0.27.0", + "gix-tempfile 7.0.0", + "gix-trace", + "gix-traverse 0.28.0", "gix-url", "gix-utils", "gix-validate", - "gix-worktree 0.19.0", + "gix-worktree 0.20.0", "log", "once_cell", "signal-hook", @@ -1100,7 +1101,7 @@ checksum = "848efa0f1210cea8638f95691c82a46f98a74b9e3524f01d4955ebc25a8f84f3" dependencies = [ "bstr 1.3.0", "btoi", - "gix-date", + "gix-date 0.5.1", "itoa", "nom", "thiserror", @@ -1108,13 +1109,13 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838" +checksum = "b70d0d809ee387113df810ab4ebe585a076e35ae6ed59b5b280072146955a3ff" dependencies = [ "bstr 1.3.0", "btoi", - "gix-date", + "gix-date 0.6.0", "itoa", "nom", "thiserror", @@ -1139,12 +1140,12 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31" +checksum = "03d7006cc5a508514207154046e18c3c39d98ba98f865ada83b6f3f3886543bb" dependencies = [ "bstr 1.3.0", - "gix-glob 0.8.0", + "gix-glob 0.9.0", "gix-path", "gix-quote", "kstring", @@ -1156,40 +1157,40 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc02feb20ad313d52a450852f2005c2205d24f851e74d82b7807cbe12c371667" +checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c" dependencies = [ "thiserror", ] [[package]] name = "gix-chunk" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7acf3bc6c4b91e8fb260086daf5e105ea3a6d913f5fd3318137f7e309d6e540" +checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd" dependencies = [ "thiserror", ] [[package]] name = "gix-command" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6141b70cfb21255223e42f3379855037cbbe8673b58dd8318d2f09b516fad1" +checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb" dependencies = [ "bstr 1.3.0", ] [[package]] name = "gix-commitgraph" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09" +checksum = "0e498e98d0b477d6a1c1608bee39db201e7a38873460a130a97ce88b4d95b6e1" dependencies = [ "bstr 1.3.0", "gix-chunk", - "gix-features 0.30.0", + "gix-features 0.31.0", "gix-hash", "memmap2 0.5.3", "thiserror", @@ -1197,16 +1198,16 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c" +checksum = "33b32541232a2c626849df7843e05b50cb43ac38a4f675abbe2f661874fc1e9d" dependencies = [ "bstr 1.3.0", "gix-config-value", - "gix-features 0.30.0", - "gix-glob 0.8.0", + "gix-features 0.31.0", + "gix-glob 0.9.0", "gix-path", - "gix-ref 0.30.0", + "gix-ref 0.31.0", "gix-sec", "log", "memchr", @@ -1219,9 +1220,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892" +checksum = "4783caa23062f86acfd1bc9e72c62250923d1673171ce1a524d9486f8a4556a8" dependencies = [ "bitflags 2.2.1", "bstr 1.3.0", @@ -1232,9 +1233,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65" +checksum = "7dcec518a8db5b2e342ea7a2e785f46fd176b1b689ddd3f43052701bf3fa8ee3" dependencies = [ "bstr 1.3.0", "gix-command", @@ -1258,14 +1259,26 @@ dependencies = [ "time", ] +[[package]] +name = "gix-date" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0213f923d63c2c7d10799c1977f42df38ec586ebbf1d14fd00dfa363ac994c2b" +dependencies = [ + "bstr 1.3.0", + "itoa", + "thiserror", + "time", +] + [[package]] name = "gix-diff" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33" +checksum = "5049dd5a60d5608912da0ab184f35064901f192f4adf737716789715faffa080" dependencies = [ "gix-hash", - "gix-object 0.30.0", + "gix-object 0.31.0", "imara-diff", "thiserror", ] @@ -1287,15 +1300,15 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46" +checksum = "c14865cb9c6eb817d6a8d53595f1051239d2d31feae7a5e5b2f00910c94a8eb4" dependencies = [ "bstr 1.3.0", "dunce", "gix-hash", "gix-path", - "gix-ref 0.30.0", + "gix-ref 0.31.0", "gix-sec", "thiserror", ] @@ -1318,11 +1331,24 @@ name = "gix-features" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314" +dependencies = [ + "flate2", + "gix-hash", + "libc", + "thiserror", +] + +[[package]] +name = "gix-features" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae82dfceec06c034728c530399ee449f97b1e542e191247c52c169ca6af1fd89" dependencies = [ "crc32fast", "crossbeam-channel", "flate2", "gix-hash", + "gix-trace", "jwalk", "libc", "once_cell", @@ -1344,11 +1370,11 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5" +checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496" dependencies = [ - "gix-features 0.30.0", + "gix-features 0.31.0", ] [[package]] @@ -1365,21 +1391,21 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e" +checksum = "f45cd7ab22faf154db0a9f5a8011ba9cda8b298b61b7299f43a21bbaf0b3f208" dependencies = [ "bitflags 2.2.1", "bstr 1.3.0", - "gix-features 0.30.0", + "gix-features 0.31.0", "gix-path", ] [[package]] name = "gix-hash" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee181c85d3955f54c4426e6bfaeeada4428692e1a39b8788c2ac7785fc301dd8" +checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272" dependencies = [ "hex", "thiserror", @@ -1387,9 +1413,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd259bd0d96e6153e357a8cdaca76c48e103fd34208b6c0ce77b1ad995834bd2" +checksum = "2cfd7f4ea905c13579565e3c264ca2c4103d192bd5fce2300c5a884cf1977d61" dependencies = [ "gix-hash", "hashbrown 0.13.1", @@ -1410,12 +1436,12 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625" +checksum = "27e82dec6975012b710837c6cd56353c3111d2308e016118bfc59275fcc8b5d0" dependencies = [ "bstr 1.3.0", - "gix-glob 0.8.0", + "gix-glob 0.9.0", "gix-path", "unicode-bom", ] @@ -1444,20 +1470,20 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4" +checksum = "2ef2fa392d351e62ac3a6309146f61880abfbe0c07474e075d3b2ac78a6834a5" dependencies = [ "bitflags 2.2.1", "bstr 1.3.0", "btoi", "filetime", "gix-bitmap", - "gix-features 0.30.0", + "gix-features 0.31.0", "gix-hash", - "gix-lock 6.0.0", - "gix-object 0.30.0", - "gix-traverse 0.27.0", + "gix-lock 7.0.0", + "gix-object 0.31.0", + "gix-traverse 0.28.0", "itoa", "memmap2 0.5.3", "smallvec", @@ -1477,37 +1503,39 @@ dependencies = [ [[package]] name = "gix-lock" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2" +checksum = "328f50aad713ab606caeaf834459ef915ccdfbb9133ac6cd54616d601aa9249f" dependencies = [ - "gix-tempfile 6.0.0", + "gix-tempfile 7.0.0", "gix-utils", "thiserror", ] [[package]] name = "gix-mailmap" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a" +checksum = "d0bef8d360a6a9fc5a6d872471588d8ca7db77b940e48ff20c3b4706ad5f481d" dependencies = [ "bstr 1.3.0", - "gix-actor 0.21.0", + "gix-actor 0.22.0", + "gix-date 0.6.0", "thiserror", ] [[package]] name = "gix-negotiate" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c" +checksum = "b626aafb9f4088058f1baa5d2029b2191820c84f6c81e43535ba70bfdc7b7d56" dependencies = [ "bitflags 2.2.1", "gix-commitgraph", + "gix-date 0.6.0", "gix-hash", - "gix-object 0.30.0", - "gix-revision", + "gix-object 0.31.0", + "gix-revwalk", "smallvec", "thiserror", ] @@ -1533,14 +1561,15 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7" +checksum = "255e477ae4cc8d10778238f011e6125b01cc0e7067dc8df87acd67a428a81f20" dependencies = [ "bstr 1.3.0", "btoi", - "gix-actor 0.21.0", - "gix-features 0.30.0", + "gix-actor 0.22.0", + "gix-date 0.6.0", + "gix-features 0.31.0", "gix-hash", "gix-validate", "hex", @@ -1552,14 +1581,15 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d98eaba4f649fed17250651c4ddfaf997c80a30f5ee4b47ac9bc18ffe3eb16" +checksum = "6b73469f145d1e6afbcfd0ab6499a366fbbcb958c2999d41d283d6c7b94024b9" dependencies = [ "arc-swap", - "gix-features 0.30.0", + "gix-date 0.6.0", + "gix-features 0.31.0", "gix-hash", - "gix-object 0.30.0", + "gix-object 0.31.0", "gix-pack", "gix-path", "gix-quote", @@ -1570,20 +1600,20 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e9e228f18cd87e7596e687b38619b5e4caebc678644ae6bb3d842598166d72" +checksum = "a1f3bcd1aaa72aea7163b147d2bde2480a01eadefc774a479d38f29920f7f1c8" dependencies = [ "clru", "gix-chunk", "gix-diff", - "gix-features 0.30.0", + "gix-features 0.31.0", "gix-hash", "gix-hashtable", - "gix-object 0.30.0", + "gix-object 0.31.0", "gix-path", - "gix-tempfile 6.0.0", - "gix-traverse 0.27.0", + "gix-tempfile 7.0.0", + "gix-traverse 0.28.0", "memmap2 0.5.3", "parking_lot 0.12.1", "smallvec", @@ -1593,11 +1623,12 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1226f2e50adeb4d76c754c1856c06f13a24cad1624801653fbf09b869e5b808" +checksum = "4ea2a19d82dd55e5fad1d606b8a1ad2f7a804e10caa2efbb169cd37e0a07ede0" dependencies = [ "bstr 1.3.0", + "gix-trace", "home", "once_cell", "thiserror", @@ -1605,9 +1636,9 @@ dependencies = [ [[package]] name = "gix-prompt" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15fe57fa48572b7d3bf465d6a2a0351cd3c55cba74fd5f0b9c23689f9c1a31e" +checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec" dependencies = [ "gix-command", "gix-config-value", @@ -1618,9 +1649,9 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d59489bff95b06dcdabe763b7266d3dc0a628cac1ac1caf65a7ca0a43eeae0" +checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40" dependencies = [ "bstr 1.3.0", "btoi", @@ -1649,18 +1680,19 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c" +checksum = "9b6c74873a9d8ff5d1310f2325f09164c15a91402ab5cde4d479ae12ff55ed69" dependencies = [ - "gix-actor 0.21.0", - "gix-features 0.30.0", - "gix-fs 0.2.0", + "gix-actor 0.22.0", + "gix-date 0.6.0", + "gix-features 0.31.0", + "gix-fs 0.3.0", "gix-hash", - "gix-lock 6.0.0", - "gix-object 0.30.0", + "gix-lock 7.0.0", + "gix-object 0.31.0", "gix-path", - "gix-tempfile 6.0.0", + "gix-tempfile 7.0.0", "gix-validate", "memmap2 0.5.3", "nom", @@ -1669,9 +1701,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4" +checksum = "ca1bc6c40bad62570683d642fcb04e977433ac8f76b674860ef7b1483c1f8990" dependencies = [ "bstr 1.3.0", "gix-hash", @@ -1683,38 +1715,39 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7" +checksum = "f3751d6643d731fc5829d2f43ca049f4333c968f30908220ba0783c9dfe5010c" dependencies = [ "bstr 1.3.0", - "gix-date", + "gix-date 0.6.0", "gix-hash", "gix-hashtable", - "gix-object 0.30.0", + "gix-object 0.31.0", "gix-revwalk", "thiserror", ] [[package]] name = "gix-revwalk" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca" +checksum = "144995229c6e5788b1c7386f8a3f7146ace3745c9a6b56cef9123a7d83b110c5" dependencies = [ "gix-commitgraph", + "gix-date 0.6.0", "gix-hash", "gix-hashtable", - "gix-object 0.30.0", + "gix-object 0.31.0", "smallvec", "thiserror", ] [[package]] name = "gix-sec" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae" +checksum = "47f09860e2ddc7b13119e410c46d8e9f870acc7933fb53ae65817af83a8c9f80" dependencies = [ "bitflags 2.2.1", "gix-path", @@ -1739,11 +1772,11 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10" +checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2" dependencies = [ - "gix-fs 0.2.0", + "gix-fs 0.3.0", "libc", "once_cell", "parking_lot 0.12.1", @@ -1778,6 +1811,12 @@ dependencies = [ "xz2", ] +[[package]] +name = "gix-trace" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff8a60073500f4d6edd181432ee11394d843db7dcf05756aa137a1233b1cbf6" + [[package]] name = "gix-traverse" version = "0.25.0" @@ -1792,14 +1831,15 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8673546506391a10fdfd4e48c8e0f3ec92355cf1fac787d2e714c7d45e301ede" +checksum = "c3f6bba1686bfbc7e0e93d4932bc6e14d479c9c9524f7c8d65b25d2a9446a99e" dependencies = [ "gix-commitgraph", + "gix-date 0.6.0", "gix-hash", "gix-hashtable", - "gix-object 0.30.0", + "gix-object 0.31.0", "gix-revwalk", "smallvec", "thiserror", @@ -1807,12 +1847,12 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863" +checksum = "ff1f984816338039b151a9f5dae6100e1e51e438cf61242ea8136fedc574d825" dependencies = [ "bstr 1.3.0", - "gix-features 0.30.0", + "gix-features 0.31.0", "gix-path", "home", "thiserror", @@ -1821,18 +1861,18 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcfcb150c7ef553d76988467d223254045bdcad0dc6724890f32fbe96415da5" +checksum = "1ca284c260845bc0724050aec59c7a596407678342614cdf5a1d69e044f29a36" dependencies = [ "fastrand", ] [[package]] name = "gix-validate" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ea5845b506c7728b9d89f4227cc369a5fc5a1d5b26c3add0f0d323413a3a60" +checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13" dependencies = [ "bstr 1.3.0", "thiserror", @@ -1861,20 +1901,20 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b32a0e7ed52577bfb050f5350bdee2741d1b08a9ed02a2f2df6effe353896ca" +checksum = "4ee22549d6723189366235e1c6959ccdac73b58197cdbb437684eaa2169edcb9" dependencies = [ "bstr 1.3.0", "filetime", - "gix-attributes 0.13.1", - "gix-features 0.30.0", - "gix-fs 0.2.0", - "gix-glob 0.8.0", + "gix-attributes 0.14.0", + "gix-features 0.31.0", + "gix-fs 0.3.0", + "gix-glob 0.9.0", "gix-hash", - "gix-ignore 0.3.0", - "gix-index 0.18.0", - "gix-object 0.30.0", + "gix-ignore 0.4.0", + "gix-index 0.19.0", + "gix-object 0.31.0", "gix-path", "io-close", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 528b3039..c926186e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ crossbeam-channel = "0.5.8" gix-features-for-configuration-only = { package = "gix-features", version = "0.30.0", features = [ "zlib-ng", ] } -gix = { version = "0.46.0", default-features = false, features = [ +gix = { version = "0.47.0", default-features = false, features = [ "max-performance-safe", ] } git2 = { version = "0.17.2", default-features = false } diff --git a/src/info/contributors.rs b/src/info/contributors.rs index 96e2741e..6addc2af 100644 --- a/src/info/contributors.rs +++ b/src/info/contributors.rs @@ -47,7 +47,7 @@ impl InfoField for ContributorsInfo { #[cfg(test)] mod test { use super::*; - use gix::actor::Time; + use gix::date::Time; #[test] fn test_display_contributors_info() { diff --git a/src/info/git/metrics.rs b/src/info/git/metrics.rs index da90070d..c05119f1 100644 --- a/src/info/git/metrics.rs +++ b/src/info/git/metrics.rs @@ -13,8 +13,8 @@ pub struct GitMetrics { pub total_number_of_authors: usize, pub total_number_of_commits: usize, pub churn_pool_size: usize, - pub time_of_most_recent_commit: gix::actor::Time, - pub time_of_first_commit: gix::actor::Time, + pub time_of_most_recent_commit: gix::date::Time, + pub time_of_first_commit: gix::date::Time, } impl GitMetrics { diff --git a/src/info/git/mod.rs b/src/info/git/mod.rs index 741a24c5..7b2c8b42 100644 --- a/src/info/git/mod.rs +++ b/src/info/git/mod.rs @@ -76,11 +76,10 @@ pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Re churn_tx.send(commit.id)?; - let commit_time = gix::actor::Time::new( + let commit_time = gix::date::Time::new( commit .commit_time - .expect("sorting by time yields this field as part of traversal") - as u32, // TODO: remove this cast once `gix` supports 64 bit dates. + .expect("sorting by time yields this field as part of traversal"), 0, ); time_of_most_recent_commit.get_or_insert(commit_time); diff --git a/src/info/utils/mod.rs b/src/info/utils/mod.rs index e1a7d93c..4be9fb47 100644 --- a/src/info/utils/mod.rs +++ b/src/info/utils/mod.rs @@ -1,6 +1,6 @@ use std::time::{Duration, SystemTime}; -use gix::actor::Time; +use gix::date::Time; use time::{format_description::well_known::Rfc3339, OffsetDateTime}; use time_humanize::HumanTime; @@ -8,7 +8,7 @@ pub mod info_field; pub fn format_time(time: Time, iso_time: bool) -> String { if iso_time { - to_rfc3339(HumanTime::from(time.seconds_since_unix_epoch as i64)) + to_rfc3339(HumanTime::from(time.seconds as i64)) } else { to_human_time(time) } @@ -26,7 +26,7 @@ fn to_human_time(time: Time) -> String { .duration_since(SystemTime::UNIX_EPOCH) .unwrap(); - let ts = Duration::from_secs(time.seconds_since_unix_epoch as u64); + let ts = Duration::from_secs(time.seconds); let duration = since_epoch_duration.checked_sub(ts).expect( "Achievement unlocked: time travel! \ Check your system clock and commit dates.", @@ -46,7 +46,7 @@ mod tests { .duration_since(SystemTime::UNIX_EPOCH) .unwrap(); - let time = Time::new(current_time.as_secs() as u32, 0); + let time = Time::new(current_time.as_secs(), 0); let result = format_time(time, false); assert_eq!(result, "now"); } @@ -59,7 +59,7 @@ mod tests { .unwrap(); // NOTE 366 so that it's a year ago even with leap years. let year_ago = current_time - (day * 366); - let time = Time::new(year_ago.as_secs() as u32, 0); + let time = Time::new(year_ago.as_secs(), 0); let result = format_time(time, false); assert_eq!(result, "a year ago"); } @@ -91,7 +91,7 @@ mod tests { .duration_since(SystemTime::UNIX_EPOCH) .unwrap(); let tomorrow = current_time + day; - let time = Time::new(tomorrow.as_secs() as u32, 0); + let time = Time::new(tomorrow.as_secs(), 0); format_time(time, false); } } diff --git a/src/info/version.rs b/src/info/version.rs index d3f3026b..b25fc962 100644 --- a/src/info/version.rs +++ b/src/info/version.rs @@ -22,7 +22,7 @@ fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result for tag in repo.references()?.tags()?.peeled().filter_map(Result::ok) { if let Ok(commit) = tag.id().object()?.try_into_commit() { - let current_time = commit.time()?.seconds(); + let current_time = commit.time()?.seconds; if current_time > most_recent { most_recent = current_time; version = tag.name().shorten().to_string();