language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-04 18:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cargo upgrade

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
crates/project-model/src/cargo_workspace.rs
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 {

2
crates/project-model/src/sysroot.rs
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()),