Merge pull request #19989 from Veykril/push-xrqwoukkltnm
`cargo update` and `cargo upgrade`
This commit is contained in:
Lukas Wirth
GitHub
commit
43d86181c0
20 changed files with 401 additions and 299 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -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 }
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
|
|||
[lib]
|
||||
|
||||
[build-dependencies]
|
||||
cargo_metadata = "0.19.2"
|
||||
cargo_metadata = "0.20.0"
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
] }
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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()),
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
] }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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()?;
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue