Unnamed repository; edit this file 'description' to name the repository.
build(deps): bump gix from 0.79.0 to 0.80.0 (#15364)
Bumps [gix](https://github.com/GitoxideLabs/gitoxide) from 0.79.0 to 0.80.0. - [Release notes](https://github.com/GitoxideLabs/gitoxide/releases) - [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md) - [Commits](https://github.com/GitoxideLabs/gitoxide/compare/gix-v0.79.0...gix-v0.80.0) --- updated-dependencies: - dependency-name: gix dependency-version: 0.80.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] 4 months ago
parent 256d75f · commit f8b3171
-rw-r--r--Cargo.lock143
-rw-r--r--helix-vcs/Cargo.toml2
2 files changed, 78 insertions, 67 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a1a2206d..c3987989 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -523,9 +523,9 @@ dependencies = [
[[package]]
name = "gix"
-version = "0.79.0"
+version = "0.80.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66adef5e4d836ad08bf424dce5e3eb18f51544eee702860419295120dd48811"
+checksum = "5aa56fdbfe98258af2759818ddc3175cc581112660e74c3fd55669836d29a994"
dependencies = [
"gix-actor",
"gix-attributes",
@@ -567,15 +567,16 @@ dependencies = [
"gix-utils",
"gix-validate",
"gix-worktree",
+ "nonempty",
"smallvec",
"thiserror",
]
[[package]]
name = "gix-actor"
-version = "0.39.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c44f13049925e8dc3955c20ecec5391cedfb041e0952416b583ecc57bc68325"
+checksum = "0e5e5b518339d5e6718af108fd064d4e9ba33caf728cf487352873d76411df35"
dependencies = [
"bstr",
"gix-date",
@@ -585,9 +586,9 @@ dependencies = [
[[package]]
name = "gix-attributes"
-version = "0.30.1"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e72da5a1c35c9a129be0c60ab9968779981ca50835dd98650ecd8b0ea4d721e"
+checksum = "c233d6eaa098c0ca5ce03236fd7a96e27f1abe72fad74b46003fbd11fe49563c"
dependencies = [
"bstr",
"gix-glob",
@@ -602,27 +603,27 @@ dependencies = [
[[package]]
name = "gix-bitmap"
-version = "0.2.16"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d982fc7ef0608e669851d0d2a6141dae74c60d5a27e8daa451f2a4857bbf41e2"
+checksum = "e7add20f40d060db8c9b1314d499bac6ed7480f33eb113ce3e1cf5d6ff85d989"
dependencies = [
- "thiserror",
+ "gix-error",
]
[[package]]
name = "gix-chunk"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14ee09ab454481a91fe969ca5afbd41c8a9b05680197b6554ebb69bdcf7d571"
+checksum = "1096b6608fbe5d27fb4984e20f992b4e76fb8c613f6acb87d07c5831b53a6959"
dependencies = [
"gix-error",
]
[[package]]
name = "gix-command"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2962172c6f78731e2b7773bf762f7b8d1746a342a4c0a8914a612206e1295953"
+checksum = "b849c65a609f50d02f8a2774fe371650b3384a743c79c2a070ce0da49b7fb7da"
dependencies = [
"bstr",
"gix-path",
@@ -633,22 +634,23 @@ dependencies = [
[[package]]
name = "gix-commitgraph"
-version = "0.33.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9dc2a550978b510b4e58b0bf5a15481433c3b21981330f3898d93f25b07d9a5"
+checksum = "aea2fcfa6bc7329cd094696ba76682b89bdb61cafc848d91b34abba1c1d7e040"
dependencies = [
"bstr",
"gix-chunk",
"gix-error",
"gix-hash",
"memmap2",
+ "nonempty",
]
[[package]]
name = "gix-config"
-version = "0.52.0"
+version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db778c8703f3c7f687e03ce22ac8f6eac02adbdafae4cb19d541126fa012524f"
+checksum = "8c24b190bd42b55724368c28ae750840b48e2038b9b5281202de6fca4ec1fce1"
dependencies = [
"bstr",
"gix-config-value",
@@ -679,9 +681,9 @@ dependencies = [
[[package]]
name = "gix-date"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e66a5117b22495fe7cb4b443777cf3f024a1b1db0009771db440fc8b38a0a6fd"
+checksum = "6c2f2155782090fd947c2f7904166b9f3c3da0d91358adb011f753ea3a55c0ff"
dependencies = [
"bstr",
"gix-error",
@@ -692,9 +694,9 @@ dependencies = [
[[package]]
name = "gix-diff"
-version = "0.59.0"
+version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee256b21a7d46cec85ab84e824742142a23a21111556a5e50c15796110c6c6"
+checksum = "60592771b104eda4e537c311e8239daef0df651d61e0e21855f7e6166416ff12"
dependencies = [
"bstr",
"gix-attributes",
@@ -716,9 +718,9 @@ dependencies = [
[[package]]
name = "gix-dir"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88897d9c3ea961d4b9a1addc466767c127b1f25713d3e054ea32ef02ab7c5db8"
+checksum = "3b483ca64cc32d9e33fa617be153ec90525ad77db51106a5f725805a066dc001"
dependencies = [
"bstr",
"gix-discover",
@@ -736,9 +738,9 @@ dependencies = [
[[package]]
name = "gix-discover"
-version = "0.47.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93103d88576e048a681ebee83e93162972cd4cbce1485a6137cfc98fc0ba152d"
+checksum = "810764b92e8cb95e4d91b7adfc5a14666434fd32ace02900dfb66aae71f845df"
dependencies = [
"bstr",
"dunce",
@@ -751,9 +753,9 @@ dependencies = [
[[package]]
name = "gix-error"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e37b10e97c822fc17550fc1a187283ad3ce79617e920bf179f301ee12abcbc"
+checksum = "f2dfe8025209bf2a72d97a6f2dff105b93e5ebcf131ffa3d3f1728ce4ac3767b"
dependencies = [
"bstr",
]
@@ -780,9 +782,9 @@ dependencies = [
[[package]]
name = "gix-filter"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "094253121df9aa1cb46d1da0200dd63ebf16263a35f03295109978bf7ed2b483"
+checksum = "7eda328750accaac05ce7637298fd7d6ba0d5d7bdf49c21f899d0b97e3df822d"
dependencies = [
"bstr",
"encoding_rs",
@@ -863,9 +865,9 @@ dependencies = [
[[package]]
name = "gix-index"
-version = "0.47.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea450ed666a39676d7e9a41b899487d1645d88053bc8c8cecfca0cf96fcd4a03"
+checksum = "13b28482b86662c8b78160e0750b097a35fd61185803a960681351b3a07de07e"
dependencies = [
"bitflags",
"bstr",
@@ -902,9 +904,9 @@ dependencies = [
[[package]]
name = "gix-object"
-version = "0.56.0"
+version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227e12fad42022ff08d6fbcc4bae34d6e2aa180576e9e1106d9a29a06798e750"
+checksum = "013eae8e072c6155191ac266950dfbc8d162408642571b32e2c6b3e4b03740fb"
dependencies = [
"bstr",
"gix-actor",
@@ -923,9 +925,9 @@ dependencies = [
[[package]]
name = "gix-odb"
-version = "0.76.0"
+version = "0.77.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84f7e115b2b6615f0c5acddc269598ebc539c363fb276dbd242755a1dd7126c"
+checksum = "f8901a182923799e8857ac01bff6d7c6fecea999abd79a86dab638aadbb843f3"
dependencies = [
"arc-swap",
"gix-features",
@@ -943,9 +945,9 @@ dependencies = [
[[package]]
name = "gix-pack"
-version = "0.66.0"
+version = "0.67.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc20b54d50f64fb02281f2a6c4a24bb9356befdf4535d5a68924575fd67cd5e"
+checksum = "194a9f96f4058359d6874123f160e5b2044974829a29f3a71bb9c9218d1916c3"
dependencies = [
"clru",
"gix-chunk",
@@ -987,9 +989,9 @@ dependencies = [
[[package]]
name = "gix-pathspec"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f4cc23f55ca7c190bf243f1a4e2139d4522022f724fb0dfc06c93f65a01ef6"
+checksum = "40e7636782b35bb1d3ade19ea7387278e96fd49f6963ab41bfca81cef4b61b20"
dependencies = [
"bitflags",
"bstr",
@@ -1002,9 +1004,9 @@ dependencies = [
[[package]]
name = "gix-protocol"
-version = "0.57.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13680c03e847d8f32a59cf1511dd05334d429da33f5af08891367680f15cbca"
+checksum = "5c64ec7b04c57df6e97a2ac4738a4a09897b88febd6ec4bd2c5d3ff3ad3849df"
dependencies = [
"bstr",
"gix-date",
@@ -1015,26 +1017,27 @@ dependencies = [
"gix-transport",
"gix-utils",
"maybe-async",
+ "nonempty",
"thiserror",
"winnow",
]
[[package]]
name = "gix-quote"
-version = "0.6.2"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fc2ff2ec8cc0c92807f02eab1f00eb02619fc2810d13dc42679492fcc36757"
+checksum = "68533db71259c8776dd4e770d2b7b98696213ecdc1f5c9e3507119e274e0c578"
dependencies = [
"bstr",
+ "gix-error",
"gix-utils",
- "thiserror",
]
[[package]]
name = "gix-ref"
-version = "0.59.0"
+version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92fd2e86d65efe972a5226f303ed72cfb49a8ad03740e5cc2b27c07970a5d78"
+checksum = "7cc7b230945f02d706a49bcf823b671785ecd9e88e713b8bd2ca5db104c97add"
dependencies = [
"gix-actor",
"gix-features",
@@ -1053,9 +1056,9 @@ dependencies = [
[[package]]
name = "gix-refspec"
-version = "0.37.0"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40adba15f8099159d37d0a21e1cfb6602c2e49b6c05f6f8a57a47d0fb21611af"
+checksum = "bb3dc194cdc1176fc20f39f233d0d516f83df843ea14a9eb758a2690f3e38d1e"
dependencies = [
"bstr",
"gix-error",
@@ -1069,9 +1072,9 @@ dependencies = [
[[package]]
name = "gix-revision"
-version = "0.41.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75ef94c9d76de0765e429ae22a01c512c0d50459269195a90ea11099a5fc752"
+checksum = "df9e31cd402edae08c3fdb67917b9fb75b0c9c9bd2fbed0c2dd9c0847039c556"
dependencies = [
"bstr",
"gix-commitgraph",
@@ -1080,13 +1083,14 @@ dependencies = [
"gix-hash",
"gix-object",
"gix-revwalk",
+ "nonempty",
]
[[package]]
name = "gix-revwalk"
-version = "0.27.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07efcad1d064abdac3e79dfc6e23e05accb579559d015e944c9dcf64be95eb49"
+checksum = "573f6e471d76c0796f0b8ed5a431521ea5d121a7860121a2a9703e9434ab1d52"
dependencies = [
"gix-commitgraph",
"gix-date",
@@ -1112,21 +1116,22 @@ dependencies = [
[[package]]
name = "gix-shallow"
-version = "0.8.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "189386b5da5285216cc0ede89eff5a943d5261fc794241ee6ec5360b77df15ad"
+checksum = "4ee51037c8a27ddb1c7a6d6db2553d01e501d5b1dae7dc65e41905a70960e658"
dependencies = [
"bstr",
"gix-hash",
"gix-lock",
+ "nonempty",
"thiserror",
]
[[package]]
name = "gix-status"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a441e06bff4a4f86ac0b320424193b061ee9c0578448eb9b965fbc96454ca292"
+checksum = "6d4b93da8aae2b5c4ec2aaa3663a0914789737ba17383c665e9270a74173e8f6"
dependencies = [
"bstr",
"filetime",
@@ -1147,9 +1152,9 @@ dependencies = [
[[package]]
name = "gix-submodule"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5d38afa855046b7b9e2b85f8cdf7fbf2e449ed061dc81fa7a757abaa38bfac"
+checksum = "6cba2022599491d620fbc77b3729dba0120862ce9b4af6e3c47d19a9f2a5d884"
dependencies = [
"bstr",
"gix-config",
@@ -1181,9 +1186,9 @@ checksum = "f69a13643b8437d4ca6845e08143e847a36ca82903eed13303475d0ae8b162e0"
[[package]]
name = "gix-transport"
-version = "0.54.0"
+version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9561a98f4f1cada03b565121c475c95d060998082bdb1277044fa6e11fe2aa17"
+checksum = "b4d72f5094b9f851e348f2cbb840d026ffd8119fc28bc2bca1387eecd171c815"
dependencies = [
"bstr",
"gix-command",
@@ -1197,9 +1202,9 @@ dependencies = [
[[package]]
name = "gix-traverse"
-version = "0.53.0"
+version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcdd399f8527f643f8d4fd8de6ec3b6e2c3c826b758b68e90f28275af2e7b33a"
+checksum = "c99b3cf9dc87c13f1404e7b0e8c5e4bff4975d6f788831c02d6c006f3c76b4a0"
dependencies = [
"bitflags",
"gix-commitgraph",
@@ -1214,9 +1219,9 @@ dependencies = [
[[package]]
name = "gix-url"
-version = "0.35.1"
+version = "0.35.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507752d41afcdf5961ab494eb062c3bf21f68b2ee67e45568e9028cccdd00c34"
+checksum = "d28e8af3d42581190da884f013caf254d2fd4d6ab102408f08d21bfa11de6c8d"
dependencies = [
"bstr",
"gix-path",
@@ -1246,9 +1251,9 @@ dependencies = [
[[package]]
name = "gix-worktree"
-version = "0.48.0"
+version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93381c5cd37fa208e3f454433425985ea02725369fb33a79ff4ecf7c279f2f98"
+checksum = "005627fc149315f39473e3e94a50058dd5d345c490a23723f67f32ee9c505232"
dependencies = [
"bstr",
"gix-attributes",
@@ -2087,6 +2092,12 @@ dependencies = [
]
[[package]]
+name = "nonempty"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9737e026353e5cd0736f98eddae28665118eb6f6600902a7f50db585621fecb6"
+
+[[package]]
name = "nucleo"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index f21e5ba0..46c22ac3 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
parking_lot.workspace = true
arc-swap.workspace = true
-gix = { version = "0.79.0", features = ["attributes", "status", "max-performance"], default-features = false, optional = true }
+gix = { version = "0.80.0", features = ["attributes", "status", "max-performance"], default-features = false, optional = true }
imara-diff = "0.2.0"
anyhow = "1"