Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock103
1 files changed, 61 insertions, 42 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 67cfcbdcaa..aca2d553b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -136,6 +136,12 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]]
name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
version = "2.12.1"
||||||| parent of 527dfbec94 (hmmm2)
version = "2.9.4"
@@ -623,7 +629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
<<<<<<< HEAD
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"block2",
"libc",
"objc2",
@@ -819,17 +825,6 @@ dependencies = [
]
[[package]]
-name = "gen-lsp-types"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b8ec601e62362b666a3def1fed667ee87b10a4507402618376d142a05373c6"
-dependencies = [
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
name = "getrandom"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1003,7 +998,7 @@ version = "0.0.0"
dependencies = [
"arrayvec",
"base-db",
- "bitflags",
+ "bitflags 2.12.1",
"cfg",
"cov-mark",
"drop_bomb",
@@ -1068,7 +1063,7 @@ version = "0.0.0"
dependencies = [
"arrayvec",
"base-db",
- "bitflags",
+ "bitflags 2.12.1",
"cov-mark",
"either",
"ena",
@@ -1361,7 +1356,7 @@ version = "0.0.0"
dependencies = [
"arrayvec",
"base-db",
- "bitflags",
+ "bitflags 2.12.1",
"cov-mark",
"crossbeam-channel",
"either",
@@ -1483,7 +1478,7 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"inotify-sys",
"libc",
]
@@ -1609,7 +1604,7 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"libc",
]
@@ -1770,30 +1765,43 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "lsp-server"
version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6ada348dbc2703cbe7637b2dda05cff84d3da2819c24abcb305dd613e0ba2e"
dependencies = [
+ "anyhow",
"crossbeam-channel",
+ "ctrlc",
"log",
+ "lsp-types",
+ "rustc-hash 2.1.2",
"serde",
"serde_derive",
"serde_json",
+ "toolchain",
]
[[package]]
name = "lsp-server"
-version = "0.8.0"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d6ada348dbc2703cbe7637b2dda05cff84d3da2819c24abcb305dd613e0ba2e"
dependencies = [
- "anyhow",
"crossbeam-channel",
- "ctrlc",
- "gen-lsp-types",
"log",
- "rustc-hash 2.1.2",
"serde",
"serde_derive",
"serde_json",
- "toolchain",
+]
+
+[[package]]
+name = "lsp-types"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
+dependencies = [
+ "bitflags 1.3.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "url",
]
[[package]]
@@ -1811,7 +1819,7 @@ name = "mbe"
version = "0.0.0"
dependencies = [
"arrayvec",
- "bitflags",
+ "bitflags 2.12.1",
"cov-mark",
"expect-test",
"intern",
@@ -1914,7 +1922,7 @@ version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -1932,7 +1940,7 @@ version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"fsevent-sys",
"inotify",
"kqueue",
@@ -1950,7 +1958,7 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
]
[[package]]
@@ -2369,7 +2377,7 @@ checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532"
dependencies = [
"bit-set",
"bit-vec",
- "bitflags",
+ "bitflags 2.12.1",
"num-traits",
"rand",
"rand_chacha",
@@ -2406,7 +2414,7 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"memchr",
"unicase",
]
@@ -2477,7 +2485,7 @@ version = "0.165.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f25a779e21ca3bba6795193b16508c8ab159f96ee4b07349893fd272065b525"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"ra-ap-rustc_hashes",
"ra-ap-rustc_index",
"tracing",
@@ -2572,7 +2580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c5d9a4d3e7bee7313599bc6d794037247ac0165f03857379cf4fc3097199e05"
dependencies = [
"arrayvec",
- "bitflags",
+ "bitflags 2.12.1",
"derive-where",
"ena",
"indexmap",
@@ -2662,7 +2670,7 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
]
[[package]]
@@ -2743,7 +2751,6 @@ dependencies = [
"dirs",
"dissimilar",
"expect-test",
- "gen-lsp-types",
"hir",
"hir-def",
"hir-ty",
@@ -2755,7 +2762,8 @@ dependencies = [
"intern",
"itertools 0.15.0",
"load-cargo",
- "lsp-server 0.7.9",
+ "lsp-server 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lsp-types",
"memchr",
"mimalloc",
"num_cpus",
@@ -2833,7 +2841,7 @@ version = "0.2.3+llvm-462a31f5a5ab"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"smallvec",
]
@@ -2855,7 +2863,7 @@ checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
>>>>>>> 527dfbec94 (hmmm2)
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"errno",
"libc",
"linux-raw-sys",
@@ -2990,9 +2998,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
dependencies = [
"indexmap",
"itoa",
@@ -3004,6 +3012,17 @@ dependencies = [
]
[[package]]
+name = "serde_repr"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "serde_spanned"
<<<<<<< HEAD
version = "1.1.1"
@@ -3961,7 +3980,7 @@ version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
- "bitflags",
+ "bitflags 2.12.1",
"hashbrown 0.15.5",
"indexmap",
"semver",
@@ -4336,7 +4355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 2.12.1",
"indexmap",
"log",
"serde",