Skip to content

internal: Sync from downstream #16412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 21, 2024
Merged

internal: Sync from downstream #16412

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6001c50
Detect `NulInCStr` error earlier.
nnethercote Dec 6, 2023
6231ca5
fix(rust-analyzer): use new pkgid spec to compare
weihanglo Jan 18, 2024
7d4980a
Rollup merge of #119172 - nnethercote:earlier-NulInCStr, r=petrochenkov
matthiaskrgr Jan 18, 2024
0661390
Rollup merge of #120084 - weihanglo:pkgid-spec, r=Mark-Simulacrum
Nadrieril Jan 21, 2024
e4866b6
Merge commit 'a9116523604c998e7781f60d3b5a6f586e0414a9' into sync-fro…
lnicola Jan 21, 2024
8af2b4d
Merge remote-tracking branch 'upstream/master' into sync-from-rust
lnicola Jan 21, 2024
ef6e6df
Merge remote-tracking branch 'upstream/master' into sync-from-rust
lnicola Jan 21, 2024
0ea0565
Revert "Detect `NulInCStr` error earlier."
lnicola Jan 21, 2024
5607714
Format code
lnicola Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions crates/proc-macro-srv/proc-macro-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,26 @@ fn main() {
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;
for message in Message::parse_stream(output.stdout.as_slice()) {
if let Message::CompilerArtifact(artifact) = message.unwrap() {
if artifact.target.kind.contains(&"proc-macro".to_string()) {
let repr = format!("{name} {version}");
if artifact.package_id.repr.starts_with(&repr) {
if artifact.package_id.repr.starts_with(&repr) || artifact.package_id.repr == pkgid
{
artifact_path = Some(PathBuf::from(&artifact.filenames[0]));
}
}
Expand Down