rustup: translate-libs: Key artifacts by src_path

cargo changed the format of package_id in JSON messages in
rust-lang/cargo#13311, but didn't change the format in --unit-graph, so
now they don't match. Use src_path as the key for artifact_outputs
instead. build-script-executed doesn't have src_path, but we can look it
up based on package_id once we have the artifact output.

Author: qsctr

src/bin/mir-json-translate-libs.rs

@@ -445,7 +445,7 @@ fn main() {
                     .iter()
                     .all(|t| t != "bin" && t != "proc-macro")
                 {
-                    artifact_outputs.insert(art.package_id.clone(), art);
+                    artifact_outputs.insert(art.target.src_path.clone(), art);
                 }
             }
             Message::BuildScriptExecuted(bs) => {
@@ -498,11 +498,13 @@ fn main() {
             } else if unit.target.crate_types.iter().any(|t| t == "bin") {
                 CustomTarget::FinalBin
             } else {
-                let artifact =
-                    artifact_outputs.get(&unit.pkg_id).unwrap_or_else(|| {
+                let artifact = artifact_outputs
+                    .get(&unit.target.src_path)
+                    .unwrap_or_else(|| {
                         panic!(
-                            "library {} should have a compiler artifact",
-                            unit.pkg_id
+                            "library {} (src_path {}) \
+                            should have a compiler artifact",
+                            unit.pkg_id, unit.target.src_path
                         )
                     });
                 // Compute the patched source file path by finding the original
@@ -524,7 +526,7 @@ fn main() {
                 .iter()
                 .collect();
                 let (linked_libs, linked_paths, cfgs, env) =
-                    match build_script_outputs.remove(&unit.pkg_id) {
+                    match build_script_outputs.remove(&artifact.package_id) {
                         Some(bs) => {
                             (bs.linked_libs, bs.linked_paths, bs.cfgs, bs.env)
                         }