Expose all profiles in the workspace.

Implement a new method Profiles::all that returns all profiles in the workspace, including the root and predefined profiles. This new method follows Cargo resolution rules to resolve profile inheritance and ordering. Signed-off-by: David Calavera <david.calavera@gmail.com>
rust-lang · Sep 25, 2023 · 5960ae1 · 5960ae1
1 parent 30af6de
commit 5960ae1
Show file tree

Hide file tree

Showing 9 changed files with 614 additions and 310 deletions.
diff --git a/src/cargo/core/profiles.rs b/src/cargo/core/profiles.rs
diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs
@@ -2,15 +2,15 @@ use crate::core::compiler::artifact::match_artifacts_kind_with_targets;
 use crate::core::compiler::{CompileKind, RustcTargetData};
 use crate::core::dependency::DepKind;
 use crate::core::package::SerializedPackage;
+use crate::core::profiles::{Profile, Profiles};
 use crate::core::resolver::{features::CliFeatures, HasDevUnits, Resolve};
 use crate::core::{Package, PackageId, Workspace};
 use crate::ops::{self, Packages};
 use crate::util::interning::InternedString;
-use crate::util::toml::TomlProfiles;
 use crate::util::CargoResult;
 use cargo_platform::Platform;
 use serde::Serialize;
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::path::PathBuf;
 
 const VERSION: u32 = 1;
@@ -50,7 +50,7 @@ pub fn output_metadata(ws: &Workspace<'_>, opt: &OutputMetadataOptions) -> Cargo
         version: VERSION,
         workspace_root: ws.root().to_path_buf(),
         metadata: ws.custom_metadata().cloned(),
-        profiles: ws.profiles().cloned(),
+        profiles: Profiles::all(ws)?,
     })
 }
 
@@ -67,8 +67,7 @@ pub struct ExportInfo {
     version: u32,
     workspace_root: PathBuf,
     metadata: Option<toml::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    profiles: Option<TomlProfiles>,
+    profiles: HashMap<InternedString, Profile>,
 }
 
 #[derive(Serialize)]

diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs
@@ -6,6 +6,8 @@ use cargo_test_support::registry::{self, Package, RegistryBuilder};
 use cargo_test_support::{basic_manifest, paths, project};
 use std::fs;
 
+use crate::metadata::DEFAULT_PROFILES;
+
 #[cargo_test]
 fn depend_on_alt_registry() {
     registry::alt_init();
@@ -844,7 +846,7 @@ fn alt_reg_metadata() {
     // iodep -> altdep2: alternative-registry
     p.cargo("metadata --format-version=1 --no-deps")
         .with_json(
-            r#"
+            &r#"
             {
                 "packages": [
                     {
@@ -909,15 +911,17 @@ fn alt_reg_metadata() {
                 "target_directory": "[..]/foo/target",
                 "version": 1,
                 "workspace_root": "[..]/foo",
-                "metadata": null
-            }"#,
+                "metadata": null,
+                "profiles": $PROFILES
+            }"#
+            .replace("$PROFILES", DEFAULT_PROFILES),
         )
         .run();
 
     // --no-deps uses a different code path, make sure both work.
     p.cargo("metadata --format-version=1")
         .with_json(
-            r#"
+            &r#"
              {
                 "packages": [
                     {
@@ -1112,8 +1116,10 @@ fn alt_reg_metadata() {
                 "target_directory": "[..]/foo/target",
                 "version": 1,
                 "workspace_root": "[..]/foo",
-                "metadata": null
-            }"#,
+                "metadata": null,
+                "profiles": $PROFILES
+            }"#
+            .replace("$PROFILES", DEFAULT_PROFILES),
         )
         .run();
 }
@@ -1160,7 +1166,7 @@ fn unknown_registry() {
     // bar -> baz registry = alternate
     p.cargo("metadata --format-version=1")
         .with_json(
-            r#"
+            &r#"
             {
               "packages": [
                 {
@@ -1278,9 +1284,11 @@ fn unknown_registry() {
               "target_directory": "[..]/foo/target",
               "version": 1,
               "workspace_root": "[..]/foo",
-              "metadata": null
+              "metadata": null,
+              "profiles": $PROFILES
             }
-            "#,
+            "#
+            .replace("$PROFILES", DEFAULT_PROFILES),
         )
         .run();
 }

diff --git a/tests/testsuite/features_namespaced.rs b/tests/testsuite/features_namespaced.rs
@@ -1,5 +1,7 @@
 //! Tests for namespaced features.
 
+use crate::metadata::DEFAULT_PROFILES;
+
 use super::features2::switch_to_resolver_2;
 use cargo_test_support::registry::{Dependency, Package, RegistryBuilder};
 use cargo_test_support::{project, publish};
@@ -576,7 +578,7 @@ fn json_exposed() {
 
     p.cargo("metadata --no-deps")
         .with_json(
-            r#"
+            &r#"
                 {
                   "packages": [
                     {
@@ -614,9 +616,11 @@ fn json_exposed() {
                   "target_directory": "[..]foo/target",
                   "version": 1,
                   "workspace_root": "[..]foo",
-                  "metadata": null
+                  "metadata": null,
+                  "profiles": $PROFILES
                 }
-            "#,
+            "#
+            .replace("$PROFILES", DEFAULT_PROFILES),
         )
         .run();
 }

diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
@@ -15,6 +15,8 @@ use cargo_test_support::registry::Package;
 use cargo_test_support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project};
 use cargo_test_support::{sleep_ms, t, Project};
 
+use crate::metadata::DEFAULT_PROFILES;
+
 #[cargo_test]
 fn cargo_compile_simple_git_dep() {
     let project = project();
@@ -3370,11 +3372,13 @@ fn metadata_master_consistency() {
               "target_directory": "[..]",
               "version": 1,
               "workspace_root": "[..]",
-              "metadata": null
+              "metadata": null,
+              "profiles": $PROFILES
             }
         "#
         .replace("__BAR_SOURCE__", bar_source)
         .replace("__BAR_HASH__", &bar_hash)
+        .replace("$PROFILES", DEFAULT_PROFILES)
     };
 
     let bar_source = format!("git+{}?branch=master", git_project.url());