language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-27 02:06:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: Bump dependencies

Browse source
This commit is contained in:
Lukas Wirth 2025-03-23 08:13:14 +01:00
parent c85fcd29a3
commit 500ea05aef
37 changed files with 261 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/project-model/src/build_dependencies.rs
View file

@ -343,7 +343,12 @@ impl WorkspaceBuildScripts {
Message::CompilerArtifact(message) => {
with_output_for(&message.package_id.repr, &mut |name, data| {
progress(format!("building proc-macros: {name}"));
if message.target.kind.iter().any(|k| k == "proc-macro") {
if message
.target
.kind
.iter()
.any(|k| *k == cargo_metadata::TargetKind::ProcMacro)
{
// Skip rmeta file
if let Some(filename) =
message.filenames.iter().find(|file| is_dylib(file))

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

@ -232,16 +232,20 @@ pub enum TargetKind {
}
impl TargetKind {
fn new(kinds: &[String]) -> TargetKind {
fn new(kinds: &[cargo_metadata::TargetKind]) -> TargetKind {
for kind in kinds {
return match kind.as_str() {
"bin" => TargetKind::Bin,
"test" => TargetKind::Test,
"bench" => TargetKind::Bench,
"example" => TargetKind::Example,
"custom-build" => TargetKind::BuildScript,
"proc-macro" => TargetKind::Lib { is_proc_macro: true },
_ if kind.contains("lib") => TargetKind::Lib { is_proc_macro: false },
return match kind {
cargo_metadata::TargetKind::Bin => TargetKind::Bin,
cargo_metadata::TargetKind::Test => TargetKind::Test,
cargo_metadata::TargetKind::Bench => TargetKind::Bench,
cargo_metadata::TargetKind::Example => TargetKind::Example,
cargo_metadata::TargetKind::CustomBuild => TargetKind::BuildScript,
cargo_metadata::TargetKind::ProcMacro => TargetKind::Lib { is_proc_macro: true },
cargo_metadata::TargetKind::Lib
| cargo_metadata::TargetKind::DyLib
| cargo_metadata::TargetKind::CDyLib
| cargo_metadata::TargetKind::StaticLib
| cargo_metadata::TargetKind::RLib => TargetKind::Lib { is_proc_macro: false },
_ => continue,
};
}
@ -476,7 +480,7 @@ impl CargoWorkspace {
cargo_metadata::Edition::E2015 => Edition::Edition2015,
cargo_metadata::Edition::E2018 => Edition::Edition2018,
cargo_metadata::Edition::E2021 => Edition::Edition2021,
cargo_metadata::Edition::_E2024 => Edition::Edition2024,
cargo_metadata::Edition::E2024 => Edition::Edition2024,
_ => {
tracing::error!("Unsupported edition `{:?}`", edition);
Edition::CURRENT