aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock207
-rw-r--r--helix-vcs/Cargo.toml2
2 files changed, 112 insertions, 97 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a6ca9495..1243bc51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -63,9 +63,9 @@ checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
[[package]]
name = "atoi"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
dependencies = [
"num-traits",
]
@@ -121,16 +121,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
[[package]]
-name = "byte-unit"
-version = "4.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c"
-dependencies = [
- "serde",
- "utf8-width",
-]
-
-[[package]]
name = "bytecount"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -211,9 +201,9 @@ dependencies = [
[[package]]
name = "clru"
-version = "0.5.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "218d6bd3dde8e442a975fa1cd233c0e5fded7596bccfe39f58eca98d22421e0a"
+checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
[[package]]
name = "codespan-reporting"
@@ -280,7 +270,7 @@ dependencies = [
"futures-core",
"libc",
"mio",
- "parking_lot",
+ "parking_lot 0.12.1",
"signal-hook",
"signal-hook-mio",
"winapi",
@@ -349,7 +339,7 @@ dependencies = [
"hashbrown 0.12.3",
"lock_api",
"once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.4",
]
[[package]]
@@ -551,9 +541,9 @@ dependencies = [
[[package]]
name = "git-actor"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fb99c934ed45a62d9ae1e7b21949f2d869d1b82a07dcbf16ed61daa665870"
+checksum = "7def29b46f25f95a2e196323cfb336eae9965e0a3c7c35ad9506f295c3a8e234"
dependencies = [
"bstr 1.0.1",
"btoi",
@@ -565,9 +555,9 @@ dependencies = [
[[package]]
name = "git-attributes"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e98446a2bf0eb5c8f29fa828d6529510a6fadeb59ce14ca98e58fa7e1e0199"
+checksum = "f0affaed361598fdd06b2a184a566c823d0b5817b09f576018248fb267193a96"
dependencies = [
"bstr 1.0.1",
"compact_str",
@@ -608,9 +598,9 @@ dependencies = [
[[package]]
name = "git-config"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd1d13179bcf3dd68e83404f91a8d01c618f54eb97ef36c68ee5e6f30183a681"
+checksum = "5ff189268cfb19d5151529ac30b6b708072ebfa1075643d785232675456ec320"
dependencies = [
"bstr 1.0.1",
"git-config-value",
@@ -629,9 +619,9 @@ dependencies = [
[[package]]
name = "git-config-value"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64561e9700f1fc737fa3c1c4ea55293be70dba98e45c54cf3715cb180f37a566"
+checksum = "989a90c1c630513a153c685b4249b96fdf938afc75bf7ef2ae1ccbd3d799f5db"
dependencies = [
"bitflags",
"bstr 1.0.1",
@@ -642,9 +632,9 @@ dependencies = [
[[package]]
name = "git-credentials"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621dd60288ae7b8f80bb0704f46d4d2b76fc1ec980a7804e48b02d94a927e331"
+checksum = "28da3d029be10258007699d002321a3b1ebe45e67b0e140a4cf464ba3ee79b32"
dependencies = [
"bstr 1.0.1",
"git-command",
@@ -658,9 +648,9 @@ dependencies = [
[[package]]
name = "git-date"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33db9f4462b565a33507aee113f3383bf16b988d2c573f07691e34302b7aa0a"
+checksum = "8a2874ce2f3a77cb144167901ea830969e5c991eac7bfee85e6e3f53ef9fcdf2"
dependencies = [
"bstr 1.0.1",
"itoa",
@@ -670,9 +660,9 @@ dependencies = [
[[package]]
name = "git-diff"
-version = "0.23.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f77407381267be95f1b26acfb32007258af342ee61729bb4271b1869bf5bb2"
+checksum = "8f30011a43908645c492dfbea7b004e10528be6bd667bf5cdc12ff4297fe1e3c"
dependencies = [
"git-hash",
"git-object",
@@ -682,9 +672,9 @@ dependencies = [
[[package]]
name = "git-discover"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c2cfd1272824b126c6997ef479a71288d00fae14dc5144dfc48658f4dd24fbe"
+checksum = "93c244b1cf7cf45501116e948506c25324e33ddc613f00557ff5bfded2132009"
dependencies = [
"bstr 1.0.1",
"git-hash",
@@ -696,9 +686,9 @@ dependencies = [
[[package]]
name = "git-features"
-version = "0.24.1"
+version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bdbe755d2129bc609437b6b18af1116f146128dda6070c15c0aa50201ac17c"
+checksum = "0f98e6ede7b790dfba16bf3c62861ae75c3719485d675b522cf7d7e748a4011c"
dependencies = [
"crc32fast",
"flate2",
@@ -713,9 +703,9 @@ dependencies = [
[[package]]
name = "git-glob"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef858611602fce54b51e45671ca72f07fe6a3c0e24a0539c66b75dfd4d84bd77"
+checksum = "3908404c9b76ac7b3f636a104142378d3eaa78623cbc6eb7c7f0651979d48e8a"
dependencies = [
"bitflags",
"bstr 1.0.1",
@@ -732,10 +722,20 @@ dependencies = [
]
[[package]]
+name = "git-hashtable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c52b625ad8cc360a0b7f426266f21fb07bd49b8f4ccf1b3ca7bc89424db1dec4"
+dependencies = [
+ "git-hash",
+ "hashbrown 0.13.1",
+]
+
+[[package]]
name = "git-index"
-version = "0.9.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87c32d2e012ee316d4037b2151e5893599379ff1fc2c6adb36d2d4d1c461e2c"
+checksum = "20627f71f3a884b0ae50f9f3abb3a07d9b117d06e16110d25b85da4d71d478c0"
dependencies = [
"atoi",
"bitflags",
@@ -766,9 +766,9 @@ dependencies = [
[[package]]
name = "git-mailmap"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480eecdfaf1bfd05973678520d182dc07afa25b133db18c52575fb65b782b7ba"
+checksum = "f90e3ee2eaeebda8a12d17f4d99dff5b19d81536476020bcebb99ee121820466"
dependencies = [
"bstr 1.0.1",
"git-actor",
@@ -777,9 +777,9 @@ dependencies = [
[[package]]
name = "git-object"
-version = "0.23.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce0f14f9cd8f0782e843898a2fb7b0c2f5a6e37bd4cdff4409bb8ec698597dad"
+checksum = "35b658f1e3e149d88cb3e0a2234be749bb0cab65887405975dbe6f3190cf6571"
dependencies = [
"bstr 1.0.1",
"btoi",
@@ -796,9 +796,9 @@ dependencies = [
[[package]]
name = "git-odb"
-version = "0.37.0"
+version = "0.38.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13493da6cf0326454215414d29f933a1e26bdba3b9b60ad8cdcbe06f0639584b"
+checksum = "55333419bbb25aa6d39e29155f747ad8e1777fe385f70f447be9d680824d23dd"
dependencies = [
"arc-swap",
"git-features",
@@ -807,16 +807,16 @@ dependencies = [
"git-pack",
"git-path",
"git-quote",
- "parking_lot",
+ "parking_lot 0.12.1",
"tempfile",
"thiserror",
]
[[package]]
name = "git-pack"
-version = "0.27.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8391cbf293f0f8ffbb5e324f25741f5e1e2d35fb87b89ab222a025661e0454"
+checksum = "9ed3c9af66949553af9795b9eac9d450a5bdceee9959352cda468997ddce0d2f"
dependencies = [
"bytesize",
"clru",
@@ -825,22 +825,22 @@ dependencies = [
"git-diff",
"git-features",
"git-hash",
+ "git-hashtable",
"git-object",
"git-path",
"git-tempfile",
"git-traverse",
- "hash_hasher",
"memmap2",
- "parking_lot",
+ "parking_lot 0.12.1",
"smallvec",
"thiserror",
]
[[package]]
name = "git-path"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f60cbc13bc0fdd95df5f4b80437197e2853116792894b1bf38d1a6b4a64f8c9"
+checksum = "e40e68481a06da243d3f4dfd86a4be39c24eefb535017a862e845140dcdb878a"
dependencies = [
"bstr 1.0.1",
"thiserror",
@@ -848,14 +848,14 @@ dependencies = [
[[package]]
name = "git-prompt"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21c6aaeb3f0f8de91f5e0eb950282c6508e05babcedef768db5a6f085d6e5242"
+checksum = "3612a486e507dd431ef0f7108eeaafc8fd1ed7bd0f205a88554f6f91fe5dccbf"
dependencies = [
"git-command",
"git-config-value",
"nix",
- "parking_lot",
+ "parking_lot 0.12.1",
"thiserror",
]
@@ -872,9 +872,9 @@ dependencies = [
[[package]]
name = "git-ref"
-version = "0.20.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22484043921e699edc170415789f1b882c8f3546e1fbbc447a0043ef07e088c4"
+checksum = "c97b7d719e4320179fb64d081016e7faca56fed4a8ee4cf84e4697faad9235a3"
dependencies = [
"git-actor",
"git-features",
@@ -891,9 +891,9 @@ dependencies = [
[[package]]
name = "git-refspec"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2e8f36e7d5d48903b60051dfb75aedfc4ea9ba66bdffa7a9081e8d276b0107"
+checksum = "d478e9db0956d60cd386d3348b5ec093e3ae613105a7a75ff6084b886254eba8"
dependencies = [
"bstr 1.0.1",
"git-hash",
@@ -905,12 +905,10 @@ dependencies = [
[[package]]
name = "git-repository"
-version = "0.29.0"
+version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89cec253dd3fba44694f7468d907506a52d0055850ecd7d84f4bac07f00e73f"
+checksum = "1925a65a9fea6587e969a7a85cb239c8e1e438cf6dc520406df1b4c9d0e83bdc"
dependencies = [
- "byte-unit",
- "clru",
"git-actor",
"git-attributes",
"git-config",
@@ -921,6 +919,7 @@ dependencies = [
"git-features",
"git-glob",
"git-hash",
+ "git-hashtable",
"git-index",
"git-lock",
"git-mailmap",
@@ -940,6 +939,7 @@ dependencies = [
"git-worktree",
"log",
"once_cell",
+ "prodash",
"signal-hook",
"smallvec",
"thiserror",
@@ -948,23 +948,23 @@ dependencies = [
[[package]]
name = "git-revision"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629289b0d7f7f2f2e46248527f5cac838e6a7cb9507eab06fc8473082db6cb6"
+checksum = "f7516b1db551756b4d3176c4b7d18ccc4b79d35dcc5e74f768c90f5bb11bb6c9"
dependencies = [
"bstr 1.0.1",
"git-date",
"git-hash",
+ "git-hashtable",
"git-object",
- "hash_hasher",
"thiserror",
]
[[package]]
name = "git-sec"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb370efde58da72827909292284b5c5b885e0621a342515a36976b0b3bf660"
+checksum = "9e1802e8252fa223b0ad89a393aed461132174ced1e6842a41f56dc92a3fc14f"
dependencies = [
"bitflags",
"dirs",
@@ -989,21 +989,21 @@ dependencies = [
[[package]]
name = "git-traverse"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2746935c92d252e24f9d345e0a981510596faceb7edae821b9e4c8c35c285b"
+checksum = "5e5141dde56d0c4861193c760e01fb61c7e03a32d0840ba93a0ac1c597588d4d"
dependencies = [
"git-hash",
+ "git-hashtable",
"git-object",
- "hash_hasher",
"thiserror",
]
[[package]]
name = "git-url"
-version = "0.11.0"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dbd91c55b1b03a833ff8278776fed272918cd61cd48efe9a97ad1fea7ef93ec"
+checksum = "8651924c9692a778f09141ca44d1bf2dada229fe9b240f1ff1bdecd9621a1a93"
dependencies = [
"bstr 1.0.1",
"git-features",
@@ -1015,9 +1015,9 @@ dependencies = [
[[package]]
name = "git-validate"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf83bae632fc064ca938ebfb987364d9083b7f98b1476805f0a2d5eebb48686"
+checksum = "0431cf9352c596dc7c8ec9066ee551ce54e63c86c3c767e5baf763f6019ff3c2"
dependencies = [
"bstr 1.0.1",
"thiserror",
@@ -1025,9 +1025,9 @@ dependencies = [
[[package]]
name = "git-worktree"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eae0e0b1050208e611d5fac0d8366b29ef3f83849767ff9c4bcf570f0d5dc2b"
+checksum = "17d748c54c3d904c914b987654a1416c7abe7cf048fdc83eeae69e6ac3d76f20"
dependencies = [
"bstr 1.0.1",
"git-attributes",
@@ -1094,12 +1094,6 @@ dependencies = [
]
[[package]]
-name = "hash_hasher"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c"
-
-[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1258,7 +1252,7 @@ dependencies = [
"helix-core",
"imara-diff",
"log",
- "parking_lot",
+ "parking_lot 0.12.1",
"tempfile",
"tokio",
]
@@ -1531,14 +1525,14 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.25.0"
+version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
dependencies = [
- "autocfg",
"bitflags",
"cfg-if",
"libc",
+ "static_assertions",
]
[[package]]
@@ -1597,12 +1591,37 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.4",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
]
[[package]]
@@ -1647,12 +1666,14 @@ dependencies = [
[[package]]
name = "prodash"
-version = "21.1.0"
+version = "22.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e13d7bd38cdab08b3a8b780cedcc54238c84fdca4084eb188807b308bcf11e6"
+checksum = "38e2b91fcc982d0d8ae5e9d477561c73e09c24c5c19bac4858e202f6f065a13e"
dependencies = [
"bytesize",
+ "dashmap",
"human_format",
+ "parking_lot 0.11.2",
]
[[package]]
@@ -2110,7 +2131,7 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
- "parking_lot",
+ "parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
"socket2",
@@ -2236,12 +2257,6 @@ dependencies = [
]
[[package]]
-name = "utf8-width"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
-
-[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index e54cf828..8e713638 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
parking_lot = "0.12"
-git-repository = { version = "0.29", default-features = false , optional = true }
+git-repository = { version = "0.30", default-features = false , optional = true }
imara-diff = "0.1.5"
log = "0.4"