bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat
-rw-r--r--Cargo.lock1409
-rw-r--r--crates/rust-analyzer/src/bin/main.rs (renamed from crates/rust-analyzer/src/bin/mod.rs)2
-rw-r--r--crates/rust-analyzer/src/handlers/dispatch.rs3
-rw-r--r--crates/rust-analyzer/src/handlers/request.rs12
-rw-r--r--crates/rust-analyzer/src/lib.rs2
-rw-r--r--crates/rust-analyzer/src/lsp/ext.rs13
-rw-r--r--crates/rust-analyzer/src/lsp/to_proto.rs62
-rw-r--r--crates/rust-analyzer/src/session.rs20
-rw-r--r--lib/lsp-server/Cargo.toml3
-rw-r--r--lib/lsp-server/src/msg.rs12
10 files changed, 317 insertions, 1221 deletions
diff --git a/Cargo.lock b/Cargo.lock
index bc0ab051db..b080eab693 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,9 +46,9 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "anyhow"
-version = "1.0.102"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
[[package]]
name = "arbitrary"
@@ -61,9 +61,9 @@ dependencies = [
[[package]]
name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
[[package]]
name = "autocfg"
@@ -83,13 +83,7 @@ dependencies = [
"miniz_oxide",
"object",
"rustc-demangle",
-<<<<<<< HEAD
"windows-link",
-||||||| parent of 527dfbec94 (hmmm2)
- "windows-targets 0.52.6",
-=======
- "windows-link 0.2.1",
->>>>>>> 527dfbec94 (hmmm2)
]
[[package]]
@@ -101,7 +95,7 @@ dependencies = [
"indexmap",
"intern",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"salsa-macros",
"semver",
@@ -135,20 +129,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]]
name = "bitflags"
-version = "2.12.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.9.4"
-=======
-version = "2.11.0"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
-=======
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
->>>>>>> 527dfbec94 (hmmm2)
+version = "2.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
[[package]]
name = "block2"
@@ -161,21 +144,9 @@ dependencies = [
[[package]]
name = "borsh"
-<<<<<<< HEAD
-version = "1.6.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.5.7"
-=======
-version = "1.6.0"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
-=======
-checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f"
dependencies = [
"bytes",
"cfg_aliases",
@@ -189,49 +160,30 @@ checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
[[package]]
name = "bumpalo"
-<<<<<<< HEAD
version = "3.20.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "3.19.0"
-=======
-version = "3.20.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
[[package]]
name = "bytes"
-version = "1.11.1"
+version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
[[package]]
name = "camino"
-version = "1.2.2"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
+checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0"
dependencies = [
"serde_core",
]
[[package]]
name = "cargo-platform"
-<<<<<<< HEAD
version = "0.3.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.3.1"
-=======
-version = "0.3.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "dd0061da739915fae12ea00e16397555ed4371a6bb285431aab930f61b0aa4ba"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "122ec45a44b270afd1402f351b782c676b173e3c3fb28d86ff7ebfb4d86a4ee4"
-=======
-checksum = "87a0c0e6148f11f01f32650a2ea02d532b2ad4e81d8bd41e6e565b5adc5e6082"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"serde",
"serde_core",
@@ -248,7 +200,7 @@ dependencies = [
"semver",
"serde",
"serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
]
[[package]]
@@ -259,21 +211,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-<<<<<<< HEAD
-version = "1.2.63"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.2.38"
-=======
-version = "1.2.56"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
-=======
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9"
dependencies = [
"find-msvc-tools",
"shlex",
@@ -288,7 +228,7 @@ dependencies = [
"expect-test",
"intern",
"oorandom",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"syntax",
"syntax-bridge",
"tracing",
@@ -303,9 +243,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "cfg_aliases"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
[[package]]
name = "ciborium"
@@ -336,42 +276,18 @@ dependencies = [
[[package]]
name = "clap"
-<<<<<<< HEAD
-version = "4.6.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "4.5.48"
-=======
-version = "4.5.60"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
-=======
-checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
->>>>>>> 527dfbec94 (hmmm2)
+version = "4.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-<<<<<<< HEAD
-version = "4.6.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "4.5.48"
-=======
-version = "4.5.60"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
-=======
-checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
->>>>>>> 527dfbec94 (hmmm2)
+version = "4.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b"
dependencies = [
"anstyle",
"clap_lex",
@@ -379,21 +295,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-<<<<<<< HEAD
version = "1.1.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.7.5"
-=======
-version = "1.0.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
-=======
-checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "cobs"
@@ -401,7 +305,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
dependencies = [
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
]
[[package]]
@@ -460,18 +364,18 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
@@ -479,27 +383,27 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
[[package]]
name = "crunchy"
@@ -514,15 +418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
dependencies = [
"dispatch2",
-<<<<<<< HEAD
"nix",
-||||||| parent of 527dfbec94 (hmmm2)
- "dispatch",
- "nix",
- "windows-sys 0.61.0",
-=======
- "nix 0.31.1",
->>>>>>> 527dfbec94 (hmmm2)
"windows-sys 0.61.2",
]
@@ -545,9 +441,6 @@ name = "deranged"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
-dependencies = [
- "powerfmt",
-]
[[package]]
name = "derive-where"
@@ -557,7 +450,7 @@ checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -568,7 +461,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -610,16 +503,8 @@ dependencies = [
[[package]]
name = "dispatch2"
-<<<<<<< HEAD
version = "0.3.1"
-||||||| parent of 527dfbec94 (hmmm2)
-name = "dispatch"
-version = "0.2.0"
-=======
-version = "0.3.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
"bitflags",
@@ -636,7 +521,7 @@ checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -663,9 +548,9 @@ version = "0.0.0"
[[package]]
name = "either"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
[[package]]
name = "embedded-io"
@@ -716,9 +601,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
[[package]]
name = "find-msvc-tools"
@@ -785,31 +670,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
[[package]]
-<<<<<<< HEAD
name = "futures-core"
-version = "0.3.32"
-||||||| parent of 527dfbec94 (hmmm2)
-name = "getrandom"
-version = "0.2.16"
-=======
-name = "getrandom"
-version = "0.2.17"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
[[package]]
name = "futures-task"
-version = "0.3.32"
+version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
[[package]]
name = "futures-util"
-version = "0.3.32"
+version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
dependencies = [
"futures-core",
"futures-task",
@@ -829,13 +705,20 @@ dependencies = [
]
[[package]]
+name = "gen-lsp-types"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b64887ac3a8083427ae935a7296db876871582cd57eac077564f8bc18fa49116"
+dependencies = [
+ "serde",
+ "serde_json",
+ "url",
+]
+
+[[package]]
name = "getrandom"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-=======
->>>>>>> 527dfbec94 (hmmm2)
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
dependencies = [
"cfg-if",
@@ -857,32 +740,13 @@ dependencies = [
[[package]]
name = "getrandom"
-<<<<<<< HEAD
-version = "0.4.2"
-||||||| parent of 527dfbec94 (hmmm2)
-name = "gimli"
-version = "0.31.1"
-=======
-version = "0.4.1"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
"libc",
"r-efi 6.0.0",
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-=======
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
->>>>>>> 527dfbec94 (hmmm2)
- "wasip2",
- "wasip3",
]
[[package]]
@@ -930,35 +794,14 @@ dependencies = [
[[package]]
name = "hashlink"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5081f264ed7adee96ea4b4778b6bb9da0a7228b084587aa3bd3ff05da7c5a3b"
+checksum = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248"
dependencies = [
"hashbrown 0.17.1",
]
[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-<<<<<<< HEAD
-||||||| parent of 527dfbec94 (hmmm2)
-=======
-name = "helix-lsp-types"
-version = "0.95.1"
-source = "git+https://git.bendn.org/helix#6a9523aefc18ffebbb42854df94ad4e9bfc6133c"
-dependencies = [
- "bitflags 2.11.0",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
->>>>>>> 527dfbec94 (hmmm2)
name = "hermit-abi"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -980,7 +823,7 @@ dependencies = [
"itertools 0.15.0",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ra-ap-rustc_type_ir",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"serde_json",
"smallvec",
@@ -1017,7 +860,7 @@ dependencies = [
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ra-ap-rustc_abi",
"ra-ap-rustc_parse_format",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustc_apfloat",
"salsa",
"smallvec",
@@ -1046,7 +889,7 @@ dependencies = [
"itertools 0.15.0",
"mbe",
"parser",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"smallvec",
"span",
@@ -1086,7 +929,7 @@ dependencies = [
"ra-ap-rustc_next_trait_solver",
"ra-ap-rustc_pattern_analysis",
"ra-ap-rustc_type_ir",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustc_apfloat",
"salsa",
"serde",
@@ -1107,21 +950,9 @@ dependencies = [
[[package]]
name = "icu_collections"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.0"
-=======
-version = "2.1.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
-=======
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"displaydoc",
"potential_utf",
@@ -1133,21 +964,9 @@ dependencies = [
[[package]]
name = "icu_locale_core"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.0"
-=======
-version = "2.1.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
-=======
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"displaydoc",
"litemap",
@@ -1158,21 +977,9 @@ dependencies = [
[[package]]
name = "icu_normalizer"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.0"
-=======
-version = "2.1.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
-=======
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"icu_collections",
"icu_normalizer_data",
@@ -1184,39 +991,15 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.0"
-=======
-version = "2.1.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
-=======
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "icu_properties"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.1"
-=======
-version = "2.1.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
-=======
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"icu_collections",
"icu_locale_core",
@@ -1228,39 +1011,15 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.1"
-=======
-version = "2.1.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
-=======
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "icu_provider"
-<<<<<<< HEAD
version = "2.2.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.0.0"
-=======
-version = "2.1.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
-=======
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"displaydoc",
"icu_locale_core",
@@ -1272,12 +1031,6 @@ dependencies = [
]
[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
-[[package]]
name = "ide"
version = "0.0.0"
dependencies = [
@@ -1371,7 +1124,7 @@ dependencies = [
"parser",
"profile",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"smallvec",
"span",
@@ -1444,39 +1197,21 @@ dependencies = [
[[package]]
name = "indexmap"
-<<<<<<< HEAD
version = "2.14.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.11.4"
-=======
-version = "2.13.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
-=======
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"equivalent",
-<<<<<<< HEAD
"hashbrown 0.17.1",
-||||||| parent of 527dfbec94 (hmmm2)
- "hashbrown 0.16.0",
-=======
- "hashbrown 0.16.1",
->>>>>>> 527dfbec94 (hmmm2)
"serde",
"serde_core",
]
[[package]]
name = "inotify"
-version = "0.11.2"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
+checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8"
dependencies = [
"bitflags",
"inotify-sys",
@@ -1485,9 +1220,9 @@ dependencies = [
[[package]]
name = "inotify-sys"
-version = "0.1.5"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
dependencies = [
"libc",
]
@@ -1500,15 +1235,15 @@ dependencies = [
"dashmap",
"hashbrown 0.14.5",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"triomphe",
]
[[package]]
name = "intrusive-collections"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e165935eba36cb526af8389effd2005a741adcbb6ed32106cc68e3f7b92960"
+checksum = "4b719c59241cfaac1042a6d26787e28ed7ee4a4e21a5a907786f54222d1b0062"
dependencies = [
"memoffset",
]
@@ -1542,21 +1277,9 @@ dependencies = [
[[package]]
name = "itoa"
-<<<<<<< HEAD
version = "1.0.18"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.15"
-=======
-version = "1.0.17"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-=======
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "jod-thread"
@@ -1566,25 +1289,12 @@ checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24"
[[package]]
name = "js-sys"
-<<<<<<< HEAD
-version = "0.3.99"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.3.82"
-=======
-version = "0.3.89"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
-=======
-checksum = "f4eacb0641a310445a4c513f2a5e23e19952e269c6a38887254d5f837a305506"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
dependencies = [
"cfg-if",
"futures-util",
- "once_cell",
"wasm-bindgen",
]
@@ -1625,17 +1335,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
-[[package]]
name = "libc"
-<<<<<<< HEAD
-version = "0.2.186"
+version = "0.2.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
[[package]]
name = "libmimalloc-sys"
@@ -1648,28 +1351,10 @@ dependencies = [
[[package]]
name = "libredox"
-<<<<<<< HEAD
-version = "0.1.17"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.1.10"
-=======
-version = "0.1.12"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
-=======
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
->>>>>>> 527dfbec94 (hmmm2)
-dependencies = [
-<<<<<<< HEAD
-||||||| parent of 527dfbec94 (hmmm2)
- "bitflags 2.9.4",
-=======
- "bitflags 2.11.0",
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+dependencies = [
"libc",
]
@@ -1700,21 +1385,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
[[package]]
name = "litemap"
-<<<<<<< HEAD
version = "0.8.2"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.0"
-=======
-version = "0.8.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-=======
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "load-cargo"
@@ -1746,21 +1419,9 @@ dependencies = [
[[package]]
name = "log"
-<<<<<<< HEAD
-version = "0.4.31"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.4.28"
-=======
-version = "0.4.29"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
-=======
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
[[package]]
name = "lsp-server"
@@ -1782,9 +1443,9 @@ dependencies = [
"anyhow",
"crossbeam-channel",
"ctrlc",
- "gen-lsp-types",
+ "gen-lsp-types 0.10.0",
"log",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"serde",
"serde_derive",
"serde_json",
@@ -1797,7 +1458,7 @@ version = "0.0.0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"synstructure",
]
@@ -1812,7 +1473,7 @@ dependencies = [
"intern",
"parser",
"ra-ap-rustc_lexer",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"smallvec",
"span",
@@ -1825,16 +1486,9 @@ dependencies = [
[[package]]
name = "memchr"
-<<<<<<< HEAD
-version = "2.8.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "2.7.6"
-=======
-version = "2.8.0"
->>>>>>> 527dfbec94 (hmmm2)
+version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
[[package]]
name = "memoffset"
@@ -1872,21 +1526,9 @@ checksum = "c505b3e17ed6b70a7ed2e67fbb2c560ee327353556120d6e72f5232b6880d536"
[[package]]
name = "mio"
-<<<<<<< HEAD
-version = "1.2.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.1.0"
-=======
-version = "1.1.1"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
-=======
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
->>>>>>> 527dfbec94 (hmmm2)
+checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
dependencies = [
"libc",
"log",
@@ -1993,16 +1635,9 @@ dependencies = [
[[package]]
name = "objc2"
-<<<<<<< HEAD
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
-||||||| parent of 527dfbec94 (hmmm2)
-=======
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"objc2-encode",
]
@@ -2060,13 +1695,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
-<<<<<<< HEAD
"windows-link",
-||||||| parent of 527dfbec94 (hmmm2)
- "windows-targets 0.52.6",
-=======
- "windows-link 0.2.1",
->>>>>>> 527dfbec94 (hmmm2)
]
[[package]]
@@ -2168,9 +1797,9 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "1.13.1"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3"
[[package]]
name = "postcard"
@@ -2186,21 +1815,9 @@ dependencies = [
[[package]]
name = "potential_utf"
-<<<<<<< HEAD
version = "0.1.5"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.1.3"
-=======
-version = "0.1.4"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
-=======
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"zerovec",
]
@@ -2221,16 +1838,6 @@ dependencies = [
]
[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
-[[package]]
name = "proc-macro-api"
version = "0.0.0"
dependencies = [
@@ -2240,7 +1847,7 @@ dependencies = [
"postcard",
"proc-macro-srv",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"semver",
"serde",
"serde_derive",
@@ -2288,9 +1895,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
dependencies = [
"unicode-ident",
]
@@ -2302,7 +1909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e842efad9119158434d193c6682e2ebee4b44d6ad801d7b349623b3f57cdf55"
dependencies = [
"indexmap",
- "nix 0.30.1",
+ "nix",
"tracing",
"windows",
]
@@ -2330,7 +1937,7 @@ dependencies = [
"itertools 0.15.0",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"paths",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"semver",
"serde",
"serde_derive",
@@ -2346,21 +1953,9 @@ dependencies = [
[[package]]
name = "proptest"
-<<<<<<< HEAD
version = "1.11.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.9.0"
-=======
-version = "1.10.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
-=======
-checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"bit-set",
"bit-vec",
@@ -2423,21 +2018,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
-<<<<<<< HEAD
-version = "1.0.45"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.40"
-=======
-version = "1.0.44"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-=======
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
dependencies = [
"proc-macro2",
]
@@ -2498,7 +2081,7 @@ checksum = "4d744a7a2852a22f06210bcff9e4667ed0cacbfbe94894cc294044d25e876341"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -2542,7 +2125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ca286f90e99bb97cd9274c088f3c874a05d1ee90cabf40a3928afedabe99fd"
dependencies = [
"ra-ap-rustc_index",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustc_apfloat",
"smallvec",
"tracing",
@@ -2563,7 +2146,7 @@ dependencies = [
"ra-ap-rustc_ast_ir",
"ra-ap-rustc_index",
"ra-ap-rustc_type_ir_macros",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"smallvec",
"thin-vec",
"tracing",
@@ -2577,15 +2160,15 @@ checksum = "5f4fd2355e2bbf1f343c730f623596efc6e465b5e3685b606a437567ebb75bf8"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"synstructure",
]
[[package]]
name = "rand"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
dependencies = [
"rand_chacha",
"rand_core",
@@ -2656,14 +2239,14 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
dependencies = [
"getrandom 0.2.17",
"libredox",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
]
[[package]]
name = "regex"
-version = "1.12.3"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
dependencies = [
"aho-corasick",
"memchr",
@@ -2673,9 +2256,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.14"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
dependencies = [
"aho-corasick",
"memchr",
@@ -2684,21 +2267,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-<<<<<<< HEAD
-version = "0.8.10"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.8"
-=======
-version = "0.8.9"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
-=======
-checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
->>>>>>> 527dfbec94 (hmmm2)
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]]
name = "rowan"
@@ -2726,7 +2297,7 @@ dependencies = [
"dirs",
"dissimilar",
"expect-test",
- "gen-lsp-types",
+ "gen-lsp-types 0.11.0",
"hir",
"hir-def",
"hir-ty",
@@ -2752,7 +2323,7 @@ dependencies = [
"project-model",
"ra-ap-rustc_type_ir",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"scip",
"semver",
"serde",
@@ -2782,9 +2353,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.27"
+version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
[[package]]
name = "rustc-hash"
@@ -2794,9 +2365,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-hash"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
[[package]]
name = "rustc-literal-escaper"
@@ -2822,21 +2393,9 @@ dependencies = [
[[package]]
name = "rustix"
-<<<<<<< HEAD
version = "1.1.4"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.1.2"
-=======
-version = "1.1.3"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
-=======
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"bitflags",
"errno",
@@ -2847,9 +2406,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
[[package]]
name = "rusty-fork"
@@ -2880,7 +2439,7 @@ dependencies = [
"parking_lot",
"portable-atomic",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa-macro-rules",
"salsa-macros",
"smallvec",
@@ -2904,7 +2463,7 @@ checksum = "76bc78ffaf65b1a9175818592c5130aa10b1bb245a905722fd4db87cea8a8457"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"synstructure",
]
@@ -2944,9 +2503,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.228"
+version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
dependencies = [
"serde_core",
"serde_derive",
@@ -2954,29 +2513,29 @@ dependencies = [
[[package]]
name = "serde_core"
-version = "1.0.228"
+version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.228"
+version = "1.0.229"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.3",
]
[[package]]
name = "serde_json"
-version = "1.0.150"
+version = "1.0.151"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
dependencies = [
"indexmap",
"itoa",
@@ -2984,26 +2543,13 @@ dependencies = [
"serde",
"serde_core",
"zmij",
-<<<<<<< HEAD
]
[[package]]
name = "serde_spanned"
-<<<<<<< HEAD
version = "1.1.1"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.3"
-=======
-version = "1.0.4"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
-=======
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"serde_core",
]
@@ -3034,9 +2580,9 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
[[package]]
name = "simd-adler32"
-version = "0.3.9"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
[[package]]
name = "slab"
@@ -3045,43 +2591,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
[[package]]
-name = "simd-adler32"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
-
-[[package]]
name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
[[package]]
name = "smol_str"
-<<<<<<< HEAD
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d"
-dependencies = [
- "borsh",
- "serde",
-]
-
-[[package]]
-name = "smol_str"
-=======
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
-dependencies = [
- "borsh",
- "serde_core",
-]
-
-[[package]]
-name = "smol_str"
->>>>>>> 527dfbec94 (hmmm2)
version = "0.3.6"
dependencies = [
"arbitrary",
@@ -3110,7 +2626,7 @@ version = "0.0.0"
dependencies = [
"hashbrown 0.17.1",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"salsa",
"stdx",
"syntax",
@@ -3147,9 +2663,20 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.117"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
dependencies = [
"proc-macro2",
"quote",
@@ -3164,7 +2691,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -3177,17 +2704,11 @@ dependencies = [
"parser",
"rayon",
"rowan",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustc-literal-escaper",
"rustc_apfloat",
"smallvec",
-<<<<<<< HEAD
"smol_str 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-||||||| parent of 527dfbec94 (hmmm2)
- "smol_str 0.3.2",
-=======
- "smol_str 0.3.5",
->>>>>>> 527dfbec94 (hmmm2)
"stdx",
"test-utils",
"tracing",
@@ -3201,7 +2722,7 @@ dependencies = [
"expect-test",
"intern",
"parser",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"span",
"stdx",
"syntax",
@@ -3217,30 +2738,12 @@ checksum = "016ef9739649996fcc983b9c588fe3d557cf216d4d98503ce1b057ab5a66d689"
[[package]]
name = "tempfile"
-<<<<<<< HEAD
version = "3.27.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "3.23.0"
-=======
-version = "3.25.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
-=======
-checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"fastrand",
-<<<<<<< HEAD
- "getrandom 0.4.2",
-||||||| parent of 527dfbec94 (hmmm2)
- "getrandom 0.3.4",
-=======
- "getrandom 0.4.1",
->>>>>>> 527dfbec94 (hmmm2)
+ "getrandom 0.4.3",
"once_cell",
"rustix",
"windows-sys 0.61.2",
@@ -3275,7 +2778,7 @@ dependencies = [
"dissimilar",
"paths",
"profile",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"stdx",
"text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -3297,9 +2800,9 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
[[package]]
name = "thin-vec"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f7e269b48f0a7dd0146680fa24b50cc67fc0373f086a5b2f99bd084639b482"
+checksum = "79def32ffcd477db1ff26f76dab9e3a91f0bd42a85ca96577089b24623056f9d"
[[package]]
name = "thiserror"
@@ -3312,11 +2815,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.18"
+version = "2.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
dependencies = [
- "thiserror-impl 2.0.18",
+ "thiserror-impl 2.0.19",
]
[[package]]
@@ -3327,18 +2830,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.3",
]
[[package]]
@@ -3349,9 +2852,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
[[package]]
name = "thread_local"
-version = "1.1.9"
+version = "1.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
dependencies = [
"cfg-if",
]
@@ -3389,12 +2892,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.47"
+version = "0.3.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "3e1d5e639ff6bab73cb6885cc7e7b1de96c3f32c68ec55f3952614bec1092244"
dependencies = [
"deranged",
- "itoa",
"libc",
"num-conv",
"num_threads",
@@ -3406,15 +2908,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
[[package]]
name = "time-macros"
-version = "0.2.27"
+version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
dependencies = [
"num-conv",
"time-core",
@@ -3422,21 +2924,9 @@ dependencies = [
[[package]]
name = "tinystr"
-<<<<<<< HEAD
version = "0.8.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.1"
-=======
-version = "0.8.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-=======
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"displaydoc",
"zerovec",
@@ -3454,21 +2944,9 @@ dependencies = [
[[package]]
name = "toml"
-<<<<<<< HEAD
-version = "1.1.2+spec-1.1.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.9.8"
-=======
-version = "0.9.12+spec-1.1.0"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
-=======
-checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.1.3+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
dependencies = [
"indexmap",
"serde_core",
@@ -3476,68 +2954,32 @@ dependencies = [
"toml_datetime",
"toml_parser",
"toml_writer",
- "winnow 1.0.3",
+ "winnow 1.0.4",
]
[[package]]
name = "toml_datetime"
-<<<<<<< HEAD
version = "1.1.1+spec-1.1.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.7.3"
-=======
-version = "0.7.5+spec-1.1.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
-=======
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"serde_core",
]
[[package]]
name = "toml_parser"
-<<<<<<< HEAD
version = "1.1.2+spec-1.1.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.4"
-=======
-version = "1.0.9+spec-1.1.0"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
-=======
-checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
- "winnow 1.0.3",
+ "winnow 1.0.4",
]
[[package]]
name = "toml_writer"
-<<<<<<< HEAD
-version = "1.1.1+spec-1.1.0"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.4"
-=======
-version = "1.0.6+spec-1.1.0"
->>>>>>> 527dfbec94 (hmmm2)
+version = "1.1.2+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
-=======
-checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
->>>>>>> 527dfbec94 (hmmm2)
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
[[package]]
name = "toolchain"
@@ -3565,7 +3007,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -3591,21 +3033,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-<<<<<<< HEAD
version = "0.3.23"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.3.20"
-=======
-version = "0.3.22"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
-=======
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"sharded-slab",
"thread_local",
@@ -3628,9 +3058,9 @@ dependencies = [
[[package]]
name = "triomphe"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
+checksum = "b40688ea6389c8171614b25491f71d4a27946e0c7ce2da1c6de27e25abf1a0ae"
dependencies = [
"serde",
"stable_deref_trait",
@@ -3644,7 +3074,7 @@ dependencies = [
"indexmap",
"intern",
"ra-ap-rustc_lexer",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"span",
"stdx",
"text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3705,12 +3135,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
-[[package]]
name = "url"
version = "2.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3744,7 +3168,7 @@ dependencies = [
"indexmap",
"nohash-hasher",
"paths",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"stdx",
"tracing",
]
@@ -3757,7 +3181,7 @@ dependencies = [
"notify",
"paths",
"rayon",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"stdx",
"tracing",
"vfs",
@@ -3791,60 +3215,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
-<<<<<<< HEAD
-version = "1.0.3+wasi-0.2.9"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "1.0.1+wasi-0.2.4"
-=======
-version = "1.0.2+wasi-0.2.9"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
-=======
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
-dependencies = [
- "wit-bindgen",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+version = "1.0.4+wasi-0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
->>>>>>> 527dfbec94 (hmmm2)
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
]
[[package]]
name = "wasm-bindgen"
-<<<<<<< HEAD
-version = "0.2.122"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.2.105"
-=======
-version = "0.2.112"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
-=======
-checksum = "05d7d0fce354c88b7982aec4400b3e7fcf723c32737cef571bd165f7613557ee"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
dependencies = [
"cfg-if",
"once_cell",
@@ -3855,21 +3237,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-<<<<<<< HEAD
-version = "0.2.122"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.2.105"
-=======
-version = "0.2.112"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
-=======
-checksum = "55839b71ba921e4f75b674cb16f843f4b1f3b26ddfcb3454de1cf65cc021ec0f"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3877,104 +3247,31 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-<<<<<<< HEAD
-version = "0.2.122"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.2.105"
-=======
-version = "0.2.112"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
-=======
-checksum = "caf2e969c2d60ff52e7e98b7392ff1588bffdd1ccd4769eba27222fd3d621571"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
dependencies = [
"bumpalo",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-<<<<<<< HEAD
-version = "0.2.122"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.2.105"
-=======
-version = "0.2.112"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
-=======
-checksum = "0861f0dcdf46ea819407495634953cdcc8a8c7215ab799a7a7ce366be71c7b30"
->>>>>>> 527dfbec94 (hmmm2)
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
-=======
- "bitflags 2.11.0",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
+ "unicode-ident",
]
[[package]]
name = "web-sys"
-version = "0.3.89"
+version = "0.3.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10053fbf9a374174094915bbce141e87a6bf32ecd9a002980db4b638405e8962"
->>>>>>> 527dfbec94 (hmmm2)
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4042,7 +3339,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -4053,30 +3350,13 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
name = "windows-link"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-link"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
-=======
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
->>>>>>> 527dfbec94 (hmmm2)
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]]
@@ -4122,13 +3402,7 @@ version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
dependencies = [
-<<<<<<< HEAD
"windows-link",
-||||||| parent of 527dfbec94 (hmmm2)
- "windows-link 0.2.0",
-=======
- "windows-link 0.2.1",
->>>>>>> 527dfbec94 (hmmm2)
]
[[package]]
@@ -4137,37 +3411,7 @@ version = "0.53.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
dependencies = [
-<<<<<<< HEAD
"windows-link",
-||||||| parent of 527dfbec94 (hmmm2)
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-dependencies = [
- "windows-link 0.1.3",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-=======
- "windows-link 0.2.1",
->>>>>>> 527dfbec94 (hmmm2)
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
@@ -4237,124 +3481,23 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
-<<<<<<< HEAD
version = "0.7.15"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.7.13"
-=======
-version = "0.7.14"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
[[package]]
name = "winnow"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-=======
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
->>>>>>> 527dfbec94 (hmmm2)
-
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
[[package]]
-<<<<<<< HEAD
name = "wit-bindgen"
version = "0.57.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap",
- "prettyplease",
- "syn",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
-[[package]]
name = "write-json"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4362,21 +3505,9 @@ checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118"
[[package]]
name = "writeable"
-<<<<<<< HEAD
version = "0.6.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.6.1"
-=======
-version = "0.6.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
-=======
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
->>>>>>> 527dfbec94 (hmmm2)
[[package]]
name = "xflags"
@@ -4430,21 +3561,9 @@ dependencies = [
[[package]]
name = "yoke"
-<<<<<<< HEAD
version = "0.8.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.0"
-=======
-version = "0.8.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-=======
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -4453,70 +3572,34 @@ dependencies = [
[[package]]
name = "yoke-derive"
-<<<<<<< HEAD
version = "0.8.2"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.0"
-=======
-version = "0.8.1"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
-=======
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"synstructure",
]
[[package]]
name = "zerocopy"
-<<<<<<< HEAD
-version = "0.8.50"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.27"
-=======
-version = "0.8.39"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
-=======
-checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.8.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-<<<<<<< HEAD
-version = "0.8.50"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.8.27"
-=======
-version = "0.8.39"
->>>>>>> 527dfbec94 (hmmm2)
-source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
-checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
-=======
-checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
->>>>>>> 527dfbec94 (hmmm2)
+version = "0.8.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -4536,27 +3619,15 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
"synstructure",
]
[[package]]
name = "zerotrie"
-<<<<<<< HEAD
version = "0.2.4"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.2.2"
-=======
-version = "0.2.3"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-=======
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"displaydoc",
"yoke",
@@ -4565,21 +3636,9 @@ dependencies = [
[[package]]
name = "zerovec"
-<<<<<<< HEAD
version = "0.11.6"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.11.4"
-=======
-version = "0.11.5"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
-=======
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"yoke",
"zerofrom",
@@ -4588,25 +3647,13 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-<<<<<<< HEAD
version = "0.11.3"
-||||||| parent of 527dfbec94 (hmmm2)
-version = "0.11.1"
-=======
-version = "0.11.2"
->>>>>>> 527dfbec94 (hmmm2)
source = "registry+https://github.com/rust-lang/crates.io-index"
-<<<<<<< HEAD
checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
-||||||| parent of 527dfbec94 (hmmm2)
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-=======
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
->>>>>>> 527dfbec94 (hmmm2)
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.119",
]
[[package]]
@@ -4625,6 +3672,6 @@ dependencies = [
[[package]]
name = "zmij"
-version = "1.0.21"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
diff --git a/crates/rust-analyzer/src/bin/mod.rs b/crates/rust-analyzer/src/bin/main.rs
index d3b2030205..5fb0002793 100644
--- a/crates/rust-analyzer/src/bin/mod.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -12,9 +12,9 @@ mod rustc_wrapper;
use std::{env, fs, path::PathBuf, process::ExitCode, sync::Arc};
+use crate::{cli::flags, config::Config};
use anyhow::Context;
use lsp_server::Connection;
-use rust_analyzer::{cli::flags, config::Config};
use tracing_subscriber::fmt::writer::BoxMakeWriter;
#[cfg(feature = "mimalloc")]
diff --git a/crates/rust-analyzer/src/handlers/dispatch.rs b/crates/rust-analyzer/src/handlers/dispatch.rs
index 8bb730827e..82a2212285 100644
--- a/crates/rust-analyzer/src/handlers/dispatch.rs
+++ b/crates/rust-analyzer/src/handlers/dispatch.rs
@@ -421,9 +421,6 @@ impl NotificationDispatcher<'_> {
self.not = Some(not);
return self;
}
- Err(ExtractError::NoResult) => {
- panic!()
- }
};
tracing::debug!(?params);
diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
index c835af0073..41e3db7f31 100644
--- a/crates/rust-analyzer/src/handlers/request.rs
+++ b/crates/rust-analyzer/src/handlers/request.rs
@@ -395,7 +395,7 @@ pub(crate) fn handle_selection_range(
pub(crate) fn handle_matching_brace(
snap: GlobalStateSnapshot,
params: lsp_ext::MatchingBraceParams,
-) -> anyhow::Result<Vec<Option<Position>>> {
+) -> anyhow::Result<Vec<Position>> {
let _p = tracing::info_span!("handle_matching_brace").entered();
let file_id = try_default!(from_proto::file_id(&snap, &params.text_document.uri)?);
let line_index = snap.file_line_index(file_id)?;
@@ -405,10 +405,11 @@ pub(crate) fn handle_matching_brace(
.map(|position| {
let offset = from_proto::offset(&line_index, *position);
offset.map(|offset| {
- match snap.analysis.matching_brace(FilePosition { file_id, offset }) {
- Ok(Some(x)) => Some(to_proto::position(&line_index, x)),
- Err(_) | Ok(None) => None,
- }
+ let offset = match snap.analysis.matching_brace(FilePosition { file_id, offset }) {
+ Ok(Some(matching_brace_offset)) => matching_brace_offset,
+ Err(_) | Ok(None) => offset,
+ };
+ to_proto::position(&line_index, offset)
})
})
.collect()
@@ -614,7 +615,6 @@ pub(crate) fn handle_document_symbol(
range: to_proto::range(&line_index, node.node_range),
selection_range: to_proto::range(&line_index, node.navigation_range),
children: None,
- sticky_range: node.sticky_range.map(|x| to_proto::range(&line_index, x)),
};
symbols.push((symbol, node.parent));
}
diff --git a/crates/rust-analyzer/src/lib.rs b/crates/rust-analyzer/src/lib.rs
index cf6d428f05..43a8d30a56 100644
--- a/crates/rust-analyzer/src/lib.rs
+++ b/crates/rust-analyzer/src/lib.rs
@@ -28,7 +28,7 @@ pub const MINIMUM_SUPPORTED_TOOLCHAIN_VERSION: semver::Version = semver::Version
build: semver::BuildMetadata::EMPTY,
};
-pub mod bin;
+// pub mod bin;
pub mod cli;
mod command;
mod diagnostics;
diff --git a/crates/rust-analyzer/src/lsp/ext.rs b/crates/rust-analyzer/src/lsp/ext.rs
index d4e75f7b1f..8f8ccbf236 100644
--- a/crates/rust-analyzer/src/lsp/ext.rs
+++ b/crates/rust-analyzer/src/lsp/ext.rs
@@ -677,6 +677,19 @@ pub struct SnippetTextDocumentEdit {
pub text_document: lsp_types::OptionalVersionedTextDocumentIdentifier,
pub edits: Vec<SnippetTextEdit>,
}
+
+#[derive(Debug, Eq, PartialEq, Clone, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SnippetTextEdit {
+ pub range: Range,
+ pub new_text: String,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub insert_text_format: Option<lsp_types::InsertTextFormat>,
+ /// The annotation id if this is an annotated
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub annotation_id: Option<lsp_types::ChangeAnnotationIdentifier>,
+}
+
#[derive(Debug)]
pub enum HoverRequest {}
diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index db963d9dc5..3d1d8fc400 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs
@@ -58,20 +58,20 @@ pub(crate) fn range(line_index: &LineIndex, range: TextRange) -> lsp_types::Rang
pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
match symbol_kind {
- SymbolKind::Function => lsp_types::SymbolKind::FUNCTION,
- SymbolKind::Method => lsp_types::SymbolKind::METHOD,
- SymbolKind::Struct => lsp_types::SymbolKind::STRUCT,
- SymbolKind::Enum => lsp_types::SymbolKind::ENUM,
- SymbolKind::Variant => lsp_types::SymbolKind::ENUM_MEMBER,
- SymbolKind::Trait => lsp_types::SymbolKind::INTERFACE,
- SymbolKind::Macro => lsp_types::SymbolKind::MACRO,
- SymbolKind::ProcMacro => lsp_types::SymbolKind::PROC_MACRO,
- SymbolKind::BuiltinAttr => lsp_types::SymbolKind::BUILTIN_ATTRIBUTE,
- SymbolKind::Attribute => lsp_types::SymbolKind::ATTRIBUTE,
- SymbolKind::Derive => lsp_types::SymbolKind::DERIVE,
- SymbolKind::CrateRoot => lsp_types::SymbolKind::PACKAGE,
- SymbolKind::DeriveHelper => lsp_types::SymbolKind::DERIVE_HELPER,
- SymbolKind::Module | SymbolKind::ToolModule => lsp_types::SymbolKind::MODULE,
+ SymbolKind::Function => lsp_types::SymbolKind::Function,
+ SymbolKind::Method => lsp_types::SymbolKind::Method,
+ SymbolKind::Struct => lsp_types::SymbolKind::Struct,
+ SymbolKind::Enum => lsp_types::SymbolKind::Enum,
+ SymbolKind::Variant => lsp_types::SymbolKind::EnumMember,
+ SymbolKind::Trait => lsp_types::SymbolKind::Interface,
+ SymbolKind::Macro
+ | SymbolKind::ProcMacro
+ | SymbolKind::BuiltinAttr
+ | SymbolKind::Attribute
+ | SymbolKind::Derive
+ | SymbolKind::DeriveHelper => lsp_types::SymbolKind::Function,
+ SymbolKind::CrateRoot => lsp_types::SymbolKind::Package,
+ SymbolKind::Module | SymbolKind::ToolModule => lsp_types::SymbolKind::Module,
SymbolKind::TypeAlias | SymbolKind::TypeParam | SymbolKind::SelfType => {
lsp_types::SymbolKind::TypeParameter
}
@@ -90,6 +90,40 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
}
}
+// pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
+// match symbol_kind {
+// SymbolKind::Function => lsp_types::SymbolKind::FUNCTION,
+// SymbolKind::Method => lsp_types::SymbolKind::METHOD,
+// SymbolKind::Struct => lsp_types::SymbolKind::STRUCT,
+// SymbolKind::Enum => lsp_types::SymbolKind::ENUM,
+// SymbolKind::Variant => lsp_types::SymbolKind::ENUM_MEMBER,
+// SymbolKind::Trait => lsp_types::SymbolKind::INTERFACE,
+// SymbolKind::Macro => lsp_types::SymbolKind::MACRO,
+// SymbolKind::ProcMacro => lsp_types::SymbolKind::PROC_MACRO,
+// SymbolKind::BuiltinAttr => lsp_types::SymbolKind::BUILTIN_ATTRIBUTE,
+// SymbolKind::Attribute => lsp_types::SymbolKind::ATTRIBUTE,
+// SymbolKind::Derive => lsp_types::SymbolKind::DERIVE,
+// SymbolKind::CrateRoot => lsp_types::SymbolKind::PACKAGE,
+// SymbolKind::DeriveHelper => lsp_types::SymbolKind::DERIVE_HELPER,
+// SymbolKind::Module | SymbolKind::ToolModule => lsp_types::SymbolKind::MODULE,
+// SymbolKind::TypeAlias | SymbolKind::TypeParam | SymbolKind::SelfType => {
+// lsp_types::SymbolKind::TypeParameter
+// }
+// SymbolKind::Field => lsp_types::SymbolKind::Field,
+// SymbolKind::Static => lsp_types::SymbolKind::Constant,
+// SymbolKind::Const => lsp_types::SymbolKind::Constant,
+// SymbolKind::ConstParam => lsp_types::SymbolKind::Constant,
+// SymbolKind::Impl => lsp_types::SymbolKind::Object,
+// SymbolKind::Local
+// | SymbolKind::SelfParam
+// | SymbolKind::LifetimeParam
+// | SymbolKind::ValueParam
+// | SymbolKind::Label => lsp_types::SymbolKind::Variable,
+// SymbolKind::Union => lsp_types::SymbolKind::Struct,
+// SymbolKind::InlineAsmRegOrRegClass => lsp_types::SymbolKind::Variable,
+// }
+// }
+
pub(crate) fn structure_node_kind(kind: StructureNodeKind) -> lsp_types::SymbolKind {
match kind {
StructureNodeKind::SymbolKind(symbol) => symbol_kind(symbol),
diff --git a/crates/rust-analyzer/src/session.rs b/crates/rust-analyzer/src/session.rs
index 3536f47999..51fc402747 100644
--- a/crates/rust-analyzer/src/session.rs
+++ b/crates/rust-analyzer/src/session.rs
@@ -36,7 +36,7 @@ impl IoThreads {
/// Returns an error if the connection breaks down or the main loop exits abnormally.
pub fn run_session(
connection: Connection,
- io_threads: IoThreads,
+ io_threads: Option<IoThreads>,
startup_notice: Option<String>,
) -> anyhow::Result<()> {
tracing::info!("server version {} will start", crate::version());
@@ -44,7 +44,9 @@ pub fn run_session(
let (initialize_id, initialize_params) = match connection.initialize_start() {
Ok(it) => it,
Err(e) => {
- if e.channel_is_disconnected() {
+ if e.channel_is_disconnected()
+ && let Some(io_threads) = io_threads
+ {
io_threads.join()?;
}
return Err(e.into());
@@ -135,7 +137,9 @@ pub fn run_session(
let initialize_result = serde_json::to_value(initialize_result).unwrap();
if let Err(e) = connection.initialize_finish(initialize_id, initialize_result) {
- if e.channel_is_disconnected() {
+ if e.channel_is_disconnected()
+ && let Some(io_threads) = io_threads
+ {
io_threads.join()?;
}
return Err(e.into());
@@ -161,11 +165,11 @@ pub fn run_session(
// If the io_threads have an error, there's usually an error on the main
// loop too because the channels are closed. Ensure we report both errors.
- match (crate::main_loop(config, connection), io_threads.join()) {
- (Err(loop_e), Err(join_e)) => anyhow::bail!("{loop_e}\n{join_e}"),
- (Ok(_), Err(join_e)) => anyhow::bail!("{join_e}"),
- (Err(loop_e), Ok(_)) => anyhow::bail!("{loop_e}"),
- (Ok(_), Ok(_)) => {}
+ match (crate::main_loop(config, connection), io_threads.map(|x| x.join())) {
+ (Err(loop_e), Some(Err(join_e))) => anyhow::bail!("{loop_e}\n{join_e}"),
+ (Ok(_), Some(Err(join_e))) => anyhow::bail!("{join_e}"),
+ (Err(loop_e), Some(Ok(_)) | None) => anyhow::bail!("{loop_e}"),
+ (Ok(_), Some(Ok(_)) | None) => {}
}
tracing::info!("server did shut down");
diff --git a/lib/lsp-server/Cargo.toml b/lib/lsp-server/Cargo.toml
index 1a179ef081..8b8617f975 100644
--- a/lib/lsp-server/Cargo.toml
+++ b/lib/lsp-server/Cargo.toml
@@ -12,6 +12,9 @@ serde_json = "1.0.140"
serde = { version = "1.0.219" }
serde_derive = { version = "1.0.219" }
crossbeam-channel.workspace = true
+lsp-types = { version = "0.10.0", package = "gen-lsp-types", features = [
+ "url",
+] }
[dev-dependencies]
lsp-types = { version = "0.10.0", package = "gen-lsp-types", features = [
diff --git a/lib/lsp-server/src/msg.rs b/lib/lsp-server/src/msg.rs
index 37eaf05346..264d8e5ce9 100644
--- a/lib/lsp-server/src/msg.rs
+++ b/lib/lsp-server/src/msg.rs
@@ -242,7 +242,7 @@ impl Response {
Response { id, response_result: Err(error) }
}
pub fn load<P: DeserializeOwned>(self) -> Result<P, ExtractError<Request>> {
- self.result.ok_or(ExtractError::NoResult).and_then(|x| {
+ self.response_result.ok().ok_or(ExtractError::NoResult).and_then(|x| {
serde_json::from_value(x)
.map_err(|error| ExtractError::JsonError { method: "".into(), error })
})
@@ -253,10 +253,10 @@ impl Request {
pub fn new<P: serde::Serialize>(id: RequestId, method: String, params: P) -> Request {
Request { id, method, params: serde_json::to_value(params).unwrap() }
}
- pub fn load<P: lsp_types::request::Request>(
+ pub fn load<P: lsp_types::Request>(
self,
) -> Result<(RequestId, P::Params), ExtractError<Request>> {
- if self.method != P::METHOD {
+ if self.method != P::METHOD.to_string() {
return Err(ExtractError::MethodMismatch(self));
}
match serde_json::from_value(self.params) {
@@ -289,10 +289,8 @@ impl Notification {
pub fn new(method: String, params: impl serde::Serialize) -> Notification {
Notification { method, params: serde_json::to_value(params).unwrap() }
}
- pub fn load<T: lsp_types::notification::Notification>(
- self,
- ) -> Result<T::Params, ExtractError<Notification>> {
- (self.method == T::METHOD).ok_or(ExtractError::NoResult).and_then(|()| {
+ pub fn load<T: lsp_types::Notification>(self) -> Result<T::Params, ExtractError<Notification>> {
+ (T::METHOD.as_str() == self.method).ok_or(ExtractError::NoResult).and_then(|()| {
serde_json::from_value(self.params)
.map_err(|e| ExtractError::JsonError { method: self.method, error: e })
})