itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(unit-graph): switch to Package ID Spec (#15447)

Browse Source 
### What does this PR try to resolve?

Fixes #15445, where there were still differences between the format of
package ids of "`cargo metadata` and build JSON messages", and
`--unit-graph` package ids.

### How should we test and review this PR?

Everything compiles correctly (and outputs what's expected). I also
fixed the testcases
This commit is contained in:
Weihang Lo 2025-04-23 17:33:01 +00:00 committed by GitHub
commit 872b92e671
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cargo/core/compiler/unit_graph.rs
View File

@ -2,10 +2,12 @@
//!
//! [`--unit-graph`]: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#unit-graph
use cargo_util_schemas::core::PackageIdSpec;
use crate::core::compiler::Unit;
use crate::core::compiler::{CompileKind, CompileMode};
use crate::core::profiles::{Profile, UnitFor};
use crate::core::{PackageId, Target};
use crate::core::Target;
use crate::util::interning::InternedString;
use crate::util::CargoResult;
use crate::GlobalContext;
@ -47,7 +49,7 @@ struct SerializedUnitGraph<'a> {
#[derive(serde::Serialize)]
struct SerializedUnit<'a> {
pkg_id: PackageId,
pkg_id: PackageIdSpec,
target: &'a Target,
profile: &'a Profile,
platform: CompileKind,
@ -109,7 +111,7 @@ pub fn emit_serialized_unit_graph(
})
.collect();
SerializedUnit {
pkg_id: unit.pkg.package_id(),
pkg_id: unit.pkg.package_id().to_spec(),
target: &unit.target,
profile: &unit.profile,
platform: unit.kind,

8
tests/testsuite/unit_graph.rs
View File

@ -68,7 +68,7 @@ fn simple() {
"feata"
],
"mode": "build",
"pkg_id": "a 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg_id": "registry+https://github.com/rust-lang/crates.io-index#a@1.0.0",
"platform": null,
"profile": {
"codegen_backend": null,
@ -113,7 +113,7 @@ fn simple() {
"featb"
],
"mode": "build",
"pkg_id": "b 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg_id": "registry+https://github.com/rust-lang/crates.io-index#b@1.0.0",
"platform": null,
"profile": {
"codegen_backend": null,
@ -151,7 +151,7 @@ fn simple() {
"featc"
],
"mode": "build",
"pkg_id": "c 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg_id": "registry+https://github.com/rust-lang/crates.io-index#c@1.0.0",
"platform": null,
"profile": {
"codegen_backend": null,
@ -194,7 +194,7 @@ fn simple() {
],
"features": [],
"mode": "build",
"pkg_id": "foo 0.1.0 (path+[ROOTURL]/foo)",
"pkg_id": "path+[ROOTURL]/foo#0.1.0",
"platform": null,
"profile": {
"codegen_backend": null,