language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 11:59:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Bump cargo_metadata

Browse source
This commit is contained in:
Laurențiu Nicola 2022-07-03 10:08:10 +03:00
parent 2d3f0b4841
commit 9e7ca80c82
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/project-model/Cargo.toml
View file

@ -12,7 +12,7 @@ doctest = false
[dependencies]
tracing = "0.1.35"
rustc-hash = "1.1.0"
cargo_metadata = "0.14.2"
cargo_metadata = "0.15.0"
semver = "1.0.10"
serde = { version = "1.0.137", features = ["derive"] }
serde_json = "1.0.81"

13
crates/project-model/src/cargo_workspace.rs
View file

@ -318,10 +318,15 @@ impl CargoWorkspace {
..
} = meta_pkg;
let meta = from_value::<PackageMetadata>(metadata.clone()).unwrap_or_default();
let edition = edition.parse::<Edition>().unwrap_or_else(|err| {
tracing::error!("Failed to parse edition {}", err);
Edition::CURRENT
});
let edition = match edition {
cargo_metadata::Edition::E2015 => Edition::Edition2015,
cargo_metadata::Edition::E2018 => Edition::Edition2018,
cargo_metadata::Edition::E2021 => Edition::Edition2021,
_ => {
tracing::error!("Unsupported edition `{:?}`", edition);
Edition::CURRENT
}
};
// We treat packages without source as "local" packages. That includes all members of
// the current workspace, as well as any path dependency outside the workspace.
let is_local = meta_pkg.source.is_none();