cargo upgrade

This commit is contained in:
Lukas Wirth 2025-06-13 10:08:20 +02:00
parent 95d5091a09
commit 23712aea06
20 changed files with 190 additions and 89 deletions

161
Cargo.lock generated
View file

@ -60,7 +60,7 @@ dependencies = [
"cfg-if",
"libc",
"miniz_oxide",
"object",
"object 0.36.7",
"rustc-demangle",
"windows-targets 0.52.6",
]
@ -130,21 +130,38 @@ dependencies = [
[[package]]
name = "cargo-platform"
version = "0.1.9"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4"
dependencies = [
"serde",
]
[[package]]
name = "cargo_metadata"
version = "0.19.2"
name = "cargo-util-schemas"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca"
dependencies = [
"semver",
"serde",
"serde-untagged",
"serde-value",
"thiserror 1.0.69",
"toml",
"unicode-xid",
"url",
]
[[package]]
name = "cargo_metadata"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502"
dependencies = [
"camino",
"cargo-platform",
"cargo-util-schemas",
"semver",
"serde",
"serde_json",
@ -190,9 +207,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chalk-derive"
version = "0.102.0"
version = "0.103.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "feb14e3ff0ebac26d8e58b6ed1417afb60c4a0a44b6425546ee7eb9c75ebb336"
checksum = "eb4899682de915ca7c0b025bdd0a3d34c75fe12184122fda6805a7baddaa293c"
dependencies = [
"proc-macro2",
"quote",
@ -202,9 +219,9 @@ dependencies = [
[[package]]
name = "chalk-ir"
version = "0.102.0"
version = "0.103.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72f0a61621a088af69fee8df39ec63cf5b6d0b9ab663a740cdeb376aabf2f244"
checksum = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed"
dependencies = [
"bitflags 2.9.1",
"chalk-derive",
@ -212,9 +229,9 @@ dependencies = [
[[package]]
name = "chalk-recursive"
version = "0.102.0"
version = "0.103.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbd3415cc540015533aa4a8ad007696d585dd9c5f81e7c099872f1dd4bf14894"
checksum = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19"
dependencies = [
"chalk-derive",
"chalk-ir",
@ -225,9 +242,9 @@ dependencies = [
[[package]]
name = "chalk-solve"
version = "0.102.0"
version = "0.103.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "747707b0c082b3ecf4b1ae28d0d8df708a46cddd22a386f9cc85a312a4de25ff"
checksum = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34"
dependencies = [
"chalk-derive",
"chalk-ir",
@ -431,6 +448,16 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "erased-serde"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
dependencies = [
"serde",
"typeid",
]
[[package]]
name = "expect-test"
version = "1.5.1"
@ -1336,6 +1363,15 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
version = "1.17.0"
@ -1364,6 +1400,15 @@ dependencies = [
"memchr",
]
[[package]]
name = "object"
version = "0.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
version = "1.21.3"
@ -1382,6 +1427,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "ordered-float"
version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
dependencies = [
"num-traits",
]
[[package]]
name = "parking_lot"
version = "0.12.4"
@ -1413,7 +1467,7 @@ dependencies = [
"edition",
"expect-test",
"ra-ap-rustc_lexer",
"rustc-literal-escaper",
"rustc-literal-escaper 0.0.3",
"stdx",
"tracing",
]
@ -1519,7 +1573,7 @@ dependencies = [
"libc",
"libloading",
"memmap2",
"object",
"object 0.37.1",
"paths",
"proc-macro-test",
"ra-ap-rustc_lexer",
@ -1573,7 +1627,7 @@ dependencies = [
"libc",
"perf-event",
"tikv-jemalloc-ctl",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -1664,9 +1718,9 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_abi"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c33b8fa229789975647ca5426be432c7c327ebde89ab15889928185dbcee3230"
checksum = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612"
dependencies = [
"bitflags 2.9.1",
"ra-ap-rustc_hashes",
@ -1676,18 +1730,18 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_hashes"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d68a3e389927002f552938a90b04787f6435f55b46fc5691360470d1cb2e99d"
checksum = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40"
dependencies = [
"rustc-stable-hash",
]
[[package]]
name = "ra-ap-rustc_index"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32502273df2838d0ca13f1c67e2a48feef940e591f9771869f07e2db2acede53"
checksum = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a"
dependencies = [
"ra-ap-rustc_index_macros",
"smallvec",
@ -1695,9 +1749,9 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_index_macros"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a32f081864ae34c7ae6634edfa7a95ab9260ba85015e8b1d347580eda79d14f"
checksum = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070"
dependencies = [
"proc-macro2",
"quote",
@ -1706,9 +1760,9 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_lexer"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed34c51974718c5bd90d876d1364d9725159fc8030c2382b9cb837034152ed68"
checksum = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab"
dependencies = [
"memchr",
"unicode-properties",
@ -1717,19 +1771,19 @@ dependencies = [
[[package]]
name = "ra-ap-rustc_parse_format"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff0440e5d27facbf4ff13ea651e48c2f6e360b3dbfc56251b41d60719b965fb8"
checksum = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce"
dependencies = [
"ra-ap-rustc_lexer",
"rustc-literal-escaper",
"rustc-literal-escaper 0.0.2",
]
[[package]]
name = "ra-ap-rustc_pattern_analysis"
version = "0.113.0"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6056efa57aba3aa0cc69a0bf1a8281624c23ad25b05748d11ebcd4668037bfc"
checksum = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892"
dependencies = [
"ra-ap-rustc_index",
"rustc-hash 2.1.1",
@ -1851,7 +1905,7 @@ dependencies = [
"vfs",
"vfs-notify",
"walkdir",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
"xflags",
"xshell",
]
@ -1880,6 +1934,12 @@ version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04"
[[package]]
name = "rustc-literal-escaper"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78744cd17f5d01c75b709e49807d1363e02a940ccee2e9e72435843fdb0d076e"
[[package]]
name = "rustc-stable-hash"
version = "0.1.2"
@ -1992,6 +2052,27 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde-untagged"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e"
dependencies = [
"erased-serde",
"serde",
"typeid",
]
[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
"ordered-float",
"serde",
]
[[package]]
name = "serde_derive"
version = "1.0.219"
@ -2099,7 +2180,7 @@ dependencies = [
"libc",
"miow",
"tracing",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -2135,7 +2216,7 @@ dependencies = [
"rayon",
"rowan",
"rustc-hash 2.1.1",
"rustc-literal-escaper",
"rustc-literal-escaper 0.0.3",
"rustc_apfloat",
"smol_str",
"stdx",
@ -2468,6 +2549,12 @@ version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]]
name = "typeid"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
[[package]]
name = "ungrammar"
version = "1.16.1"
@ -3060,9 +3147,9 @@ dependencies = [
[[package]]
name = "zip"
version = "3.0.0"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
checksum = "153a6fff49d264c4babdcfa6b4d534747f520e56e8f0f384f3b808c4b64cc1fd"
dependencies = [
"arbitrary",
"crc32fast",

View file

@ -87,11 +87,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }
edition = { path = "./crates/edition", version = "0.0.0" }
ra-ap-rustc_lexer = { version = "0.113", default-features = false }
ra-ap-rustc_parse_format = { version = "0.113", default-features = false }
ra-ap-rustc_index = { version = "0.113", default-features = false }
ra-ap-rustc_abi = { version = "0.113", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.113", default-features = false }
ra-ap-rustc_lexer = { version = "0.116", default-features = false }
ra-ap-rustc_parse_format = { version = "0.116", default-features = false }
ra-ap-rustc_index = { version = "0.116", default-features = false }
ra-ap-rustc_abi = { version = "0.116", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.116", default-features = false }
# local crates that aren't published to crates.io. These should not have versions.
@ -101,35 +101,35 @@ la-arena = { version = "0.3.1" }
lsp-server = { version = "0.7.8" }
# non-local crates
anyhow = "1.0.97"
anyhow = "1.0.98"
arrayvec = "0.7.6"
bitflags = "2.9.0"
cargo_metadata = "0.19.2"
camino = "1.1.9"
chalk-solve = { version = "0.102.0", default-features = false }
chalk-ir = "0.102.0"
chalk-recursive = { version = "0.102.0", default-features = false }
chalk-derive = "0.102.0"
bitflags = "2.9.1"
cargo_metadata = "0.20.0"
camino = "1.1.10"
chalk-solve = { version = "0.103.0", default-features = false }
chalk-ir = "0.103.0"
chalk-recursive = { version = "0.103.0", default-features = false }
chalk-derive = "0.103.0"
crossbeam-channel = "0.5.15"
dissimilar = "1.0.10"
dot = "0.1.4"
either = "1.15.0"
expect-test = "1.5.1"
indexmap = { version = "2.8.0", features = ["serde"] }
indexmap = { version = "2.9.0", features = ["serde"] }
itertools = "0.14.0"
libc = "0.2.171"
libloading = "0.8.6"
libc = "0.2.172"
libloading = "0.8.8"
memmap2 = "0.9.5"
nohash-hasher = "0.2.0"
oorandom = "11.1.5"
object = { version = "0.36.7", default-features = false, features = [
object = { version = "0.37.1", default-features = false, features = [
"std",
"read_core",
"elf",
"macho",
"pe",
] }
process-wrap = { version = "8.2.0", features = ["std"] }
process-wrap = { version = "8.2.1", features = ["std"] }
pulldown-cmark-to-cmark = "10.0.4"
pulldown-cmark = { version = "0.9.6", default-features = false }
rayon = "1.10.0"
@ -141,8 +141,8 @@ serde = { version = "1.0.219" }
serde_derive = { version = "1.0.219" }
serde_json = "1.0.140"
rustc-hash = "2.1.1"
rustc-literal-escaper = "0.0.2"
smallvec = { version = "1.14.0", features = [
rustc-literal-escaper = "0.0.3"
smallvec = { version = "1.15.1", features = [
"const_new",
"union",
"const_generics",
@ -166,7 +166,7 @@ xshell = "0.2.7"
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
dashmap = { version = "=6.1.0", features = ["raw-api", "inline"] }
# We need to freeze the version of the crate, as it needs to match with dashmap
hashbrown = { version = "0.14.0", features = [
hashbrown = { version = "0.14.*", features = [
"inline-more",
], default-features = false }

View file

@ -25,7 +25,7 @@ rustc-hash.workspace = true
tracing.workspace = true
smallvec.workspace = true
triomphe.workspace = true
rustc_apfloat = "0.2.2"
rustc_apfloat = "0.2.3"
text-size.workspace = true
salsa.workspace = true
salsa-macros.workspace = true

View file

@ -377,6 +377,7 @@ language_item_table! {
AsyncFnMut, sym::async_fn_mut, async_fn_mut_trait, Target::Trait, GenericRequirement::Exact(1);
AsyncFnOnce, sym::async_fn_once, async_fn_once_trait, Target::Trait, GenericRequirement::Exact(1);
AsyncFnOnceOutput, sym::async_fn_once_output,async_fn_once_output, Target::AssocTy, GenericRequirement::None;
FnOnceOutput, sym::fn_once_output, fn_once_output, Target::AssocTy, GenericRequirement::None;
Future, sym::future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0);

View file

@ -31,7 +31,7 @@ la-arena.workspace = true
triomphe.workspace = true
typed-arena = "2.0.2"
indexmap.workspace = true
rustc_apfloat = "0.2.2"
rustc_apfloat = "0.2.3"
query-group.workspace = true
salsa.workspace = true
salsa-macros.workspace = true

View file

@ -261,10 +261,20 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> {
&self,
well_known_trait: WellKnownTrait,
) -> Option<chalk_ir::TraitId<Interner>> {
let lang_attr = lang_item_from_well_known_trait(well_known_trait);
let trait_ = lang_attr.resolve_trait(self.db, self.krate)?;
let lang_item = lang_item_from_well_known_trait(well_known_trait);
let trait_ = lang_item.resolve_trait(self.db, self.krate)?;
Some(to_chalk_trait_id(trait_))
}
fn well_known_assoc_type_id(
&self,
assoc_type: rust_ir::WellKnownAssocType,
) -> Option<chalk_ir::AssocTypeId<Interner>> {
let lang_item = match assoc_type {
rust_ir::WellKnownAssocType::AsyncFnOnceOutput => LangItem::AsyncFnOnceOutput,
};
let alias = lang_item.resolve_type_alias(self.db, self.krate)?;
Some(to_assoc_type_id(alias))
}
fn program_clauses_for_env(
&self,

View file

@ -22,7 +22,7 @@ either.workspace = true
itertools.workspace = true
arrayvec.workspace = true
indexmap.workspace = true
memchr = "2.7.4"
memchr = "2.7.5"
salsa.workspace = true
salsa-macros.workspace = true
query-group.workspace = true

View file

@ -25,7 +25,7 @@ dot.workspace = true
smallvec.workspace = true
triomphe.workspace = true
nohash-hasher.workspace = true
rustc_apfloat = "0.2.2"
rustc_apfloat = "0.2.3"
# local deps
cfg.workspace = true

View file

@ -222,6 +222,7 @@ define_symbols! {
fn_once_output,
fn_once,
async_fn_once,
async_fn_once_output,
async_fn_mut,
async_fn,
fn_ptr_addr,

View file

@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
[lib]
[build-dependencies]
cargo_metadata = "0.19.2"
cargo_metadata = "0.20.0"

View file

@ -12,7 +12,7 @@ rust-version.workspace = true
[lib]
[dependencies]
cfg-if = "1.0.0"
cfg-if = "1.0.1"
jemalloc-ctl = { version = "0.5.4", package = "tikv-jemalloc-ctl", optional = true }
[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
@ -22,7 +22,7 @@ perf-event = "=0.4.7"
libc.workspace = true
[target.'cfg(windows)'.dependencies]
windows-sys = { version = "0.59", features = [
windows-sys = { version = "0.60", features = [
"Win32_System_Threading",
"Win32_System_ProcessStatus",
] }

View file

@ -492,7 +492,7 @@ impl CargoWorkspace {
is_virtual_workspace &= manifest != ws_manifest_path;
let pkg = packages.alloc(PackageData {
id: id.repr.clone(),
name,
name: name.to_string(),
version,
manifest: manifest.clone(),
targets: Vec::new(),
@ -547,10 +547,12 @@ impl CargoWorkspace {
.flat_map(|dep| DepKind::iter(&dep.dep_kinds).map(move |kind| (dep, kind)));
for (dep_node, kind) in dependencies {
let &pkg = pkg_by_id.get(&dep_node.pkg).unwrap();
let dep = PackageDependency { name: dep_node.name.clone(), pkg, kind };
let dep = PackageDependency { name: dep_node.name.to_string(), pkg, kind };
packages[source].dependencies.push(dep);
}
packages[source].active_features.extend(node.features);
packages[source]
.active_features
.extend(node.features.into_iter().map(|it| it.to_string()));
}
CargoWorkspace {

View file

@ -339,7 +339,7 @@ impl Sysroot {
Some(_) => {
tracing::warn!("unknown rustc-std-workspace-* crate: {}", package.name)
}
None => match &*package.name {
None => match &**package.name {
"core" => real_core = Some(package.id.clone()),
"alloc" => real_alloc = Some(package.id.clone()),
"std" => real_std = Some(package.id.clone()),

View file

@ -29,7 +29,7 @@ indexmap.workspace = true
itertools.workspace = true
scip = "0.5.2"
lsp-types = { version = "=0.95.0", features = ["proposed"] }
parking_lot = "0.12.3"
parking_lot = "0.12.4"
xflags = "0.3.2"
oorandom = "11.1.5"
rayon.workspace = true
@ -37,19 +37,19 @@ rustc-hash.workspace = true
serde_json = { workspace = true, features = ["preserve_order"] }
serde.workspace = true
serde_derive.workspace = true
tenthash = "1.0.0"
num_cpus = "1.16.0"
mimalloc = { version = "0.1.44", default-features = false, optional = true }
tenthash = "1.1.0"
num_cpus = "1.17.0"
mimalloc = { version = "0.1.46", default-features = false, optional = true }
lsp-server.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
tracing-tree.workspace = true
triomphe.workspace = true
toml = "0.8.20"
toml = "0.8.23"
nohash-hasher.workspace = true
walkdir = "2.5.0"
semver.workspace = true
memchr = "2.7.4"
memchr = "2.7.5"
cargo_metadata.workspace = true
process-wrap.workspace = true
@ -75,7 +75,7 @@ vfs.workspace = true
paths.workspace = true
[target.'cfg(windows)'.dependencies]
windows-sys = { version = "0.59", features = [
windows-sys = { version = "0.60", features = [
"Win32_System_Diagnostics_Debug",
"Win32_System_Threading",
] }

View file

@ -12,7 +12,7 @@ rust-version.workspace = true
[lib]
[dependencies]
backtrace = { version = "0.3.74", optional = true }
backtrace = { version = "0.3.75", optional = true }
jod-thread = "1.0.0"
crossbeam-channel.workspace = true
itertools.workspace = true
@ -25,7 +25,7 @@ libc.workspace = true
[target.'cfg(windows)'.dependencies]
miow = "0.6.0"
windows-sys = { version = "0.59", features = ["Win32_Foundation"] }
windows-sys = { version = "0.60", features = ["Win32_Foundation"] }
[features]
# Uncomment to enable for the whole crate graph

View file

@ -27,7 +27,7 @@ stdx.workspace = true
[dev-dependencies]
rayon.workspace = true
expect-test = "1.5.1"
rustc_apfloat = "0.2.2"
rustc_apfloat = "0.2.3"
test-utils.workspace = true

View file

@ -7,7 +7,7 @@ repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-ser
edition = "2024"
[dependencies]
log = "0.4.26"
log = "0.4.27"
serde_json = "1.0.140"
serde = { version = "1.0.219" }
serde_derive = { version = "1.0.219" }
@ -15,7 +15,7 @@ crossbeam-channel.workspace = true
[dev-dependencies]
lsp-types = "=0.95"
ctrlc = "3.4.5"
ctrlc = "3.4.7"
[lints]
workspace = true

View file

@ -283,12 +283,12 @@ fn read_msg_text(inp: &mut dyn BufRead) -> io::Result<Option<String>> {
buf.resize(size, 0);
inp.read_exact(&mut buf)?;
let buf = String::from_utf8(buf).map_err(invalid_data)?;
log::debug!("< {}", buf);
log::debug!("< {buf}");
Ok(Some(buf))
}
fn write_msg_text(out: &mut dyn Write, msg: &str) -> io::Result<()> {
log::debug!("> {}", msg);
log::debug!("> {msg}");
write!(out, "Content-Length: {}\r\n\r\n", msg.len())?;
out.write_all(msg.as_bytes())?;
out.flush()?;

View file

@ -38,7 +38,7 @@ pub(crate) fn stdio_transport() -> (Sender<Message>, Receiver<Message>, IoThread
while let Some(msg) = Message::read(&mut stdin)? {
let is_exit = matches!(&msg, Message::Notification(n) if n.is_exit());
debug!("sending message {:#?}", msg);
debug!("sending message {msg:#?}");
if let Err(e) = reader_sender.send(msg) {
return Err(io::Error::other(e));
}

View file

@ -9,14 +9,14 @@ rust-version.workspace = true
[dependencies]
anyhow.workspace = true
directories = "6.0"
flate2 = "1.1.0"
flate2 = "1.1.2"
write-json = "0.1.4"
xshell.workspace = true
xflags = "0.3.2"
time = { version = "0.3", default-features = false }
zip = { version = "3.0", default-features = false, features = ["deflate-flate2", "time"] }
zip = { version = "4.0", default-features = false, features = ["deflate-flate2", "time"] }
stdx.workspace = true
proc-macro2 = "1.0.94"
proc-macro2 = "1.0.95"
quote = "1.0.40"
ungrammar = "1.16.1"
either.workspace = true