Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(rust-analyzer): use new pkgid spec to compare

Browse source 
Starting from cargo#13311, Cargo's compiler artifact message
uses Package ID specification as package's identifier format.
This commit is contained in:
Weihang Lo 2024-01-18 06:50:06 +00:00 committed by Weihang Lo
parent 6bbd106c70
commit 6231ca5f5e
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/proc-macro-srv/proc-macro-test/build.rs
View file

@ -92,12 +92,24 @@ fn main() {
panic!("proc-macro-test-impl failed to build"); panic!("proc-macro-test-impl failed to build");
} }
// Old Package ID Spec
let repr = format!("{name} {version}");
// New Package Id Spec since rust-lang/cargo#13311
let pkgid = String::from_utf8(
Command::new(toolchain::cargo())
.current_dir(&staging_dir)
.args(["pkgid", name])
.output()
.unwrap().stdout,
)
.unwrap();
let pkgid = pkgid.trim();
let mut artifact_path = None; let mut artifact_path = None;
for message in Message::parse_stream(output.stdout.as_slice()) { for message in Message::parse_stream(output.stdout.as_slice()) {
if let Message::CompilerArtifact(artifact) = message.unwrap() { if let Message::CompilerArtifact(artifact) = message.unwrap() {
if artifact.target.kind.contains(&"proc-macro".to_string()) { if artifact.target.kind.contains(&"proc-macro".to_string()) {
let repr = format!("{name} {version}"); if artifact.package_id.repr.starts_with(&repr) || artifact.package_id.repr == pkgid {
if artifact.package_id.repr.starts_with(&repr) {
artifact_path = Some(PathBuf::from(&artifact.filenames[0])); artifact_path = Some(PathBuf::from(&artifact.filenames[0]));
} }
} }