Packages can inherit fields from their root workspace

crates/cargo-test-support/src/lib.rs

@@ -1609,6 +1609,19 @@ pub fn basic_lib_manifest(name: &str) -> String {
     )
 }
 
+pub fn basic_workspace_manifest(name: &str, workspace: &str) -> String {
+    format!(
+        r#"
+        [package]
+        name = "{}"
+        version = "0.1.0"
+        authors = []
+        workspace = "{}"
+    "#,
+        name, workspace
+    )
+}
+
 pub fn path2url<P: AsRef<Path>>(p: P) -> Url {
     Url::from_file_path(p).ok().unwrap()
 }

src/cargo/core/compiler/standard_lib.rs

@@ -11,6 +11,7 @@ use crate::util::errors::CargoResult;
 use std::collections::{HashMap, HashSet};
 use std::env;
 use std::path::PathBuf;
+use std::rc::Rc;
 
 /// Parse the `-Zbuild-std` flag.
 pub fn parse_unstable_flag(value: Option<&str>) -> Vec<String> {
@@ -60,17 +61,13 @@ pub fn resolve_std<'cfg>(
         String::from("library/alloc"),
         String::from("library/test"),
     ];
-    let ws_config = crate::core::WorkspaceConfig::Root(crate::core::WorkspaceRootConfig::new(
-        &src_path,
-        &Some(members),
-        /*default_members*/ &None,
-        /*exclude*/ &None,
-        /*custom_metadata*/ &None,
-    ));
+    let ws_config = crate::core::WorkspaceConfig::Root(
+        crate::core::WorkspaceRootConfig::from_members(&src_path, members),
+    );
     let virtual_manifest = crate::core::VirtualManifest::new(
         /*replace*/ Vec::new(),
         patch,
-        ws_config,
+        Rc::new(ws_config),
         /*profiles*/ None,
         crate::core::Features::default(),
         None,

src/cargo/core/manifest.rs

@@ -16,14 +16,23 @@ use crate::core::{Dependency, PackageId, PackageIdSpec, SourceId, Summary};
 use crate::core::{Edition, Feature, Features, WorkspaceConfig};
 use crate::util::errors::*;
 use crate::util::interning::InternedString;
-use crate::util::toml::{TomlManifest, TomlProfiles};
+use crate::util::toml::{DefinedTomlManifest, TomlProfiles};
 use crate::util::{short_hash, Config, Filesystem};
 
 pub enum EitherManifest {
     Real(Manifest),
     Virtual(VirtualManifest),
 }
 
+impl EitherManifest {
+    pub fn workspace(&self) -> Rc<WorkspaceConfig> {
+        match self {
+            Self::Real(manifest) => Rc::clone(&manifest.workspace),
+            Self::Virtual(virtual_manifest) => Rc::clone(&virtual_manifest.workspace),
+        }
+    }
+}
+
 /// Contains all the information about a package, as loaded from a `Cargo.toml`.
 #[derive(Clone, Debug)]
 pub struct Manifest {
@@ -40,8 +49,8 @@ pub struct Manifest {
     publish_lockfile: bool,
     replace: Vec<(PackageIdSpec, Dependency)>,
     patch: HashMap<Url, Vec<Dependency>>,
-    workspace: WorkspaceConfig,
-    original: Rc<TomlManifest>,
+    workspace: Rc<WorkspaceConfig>,
+    original: Rc<DefinedTomlManifest>,
     features: Features,
     edition: Edition,
     im_a_teapot: Option<bool>,
@@ -66,7 +75,7 @@ pub struct Warnings(Vec<DelayedWarning>);
 pub struct VirtualManifest {
     replace: Vec<(PackageIdSpec, Dependency)>,
     patch: HashMap<Url, Vec<Dependency>>,
-    workspace: WorkspaceConfig,
+    workspace: Rc<WorkspaceConfig>,
     profiles: Option<TomlProfiles>,
     warnings: Warnings,
     features: Features,
@@ -370,12 +379,12 @@ impl Manifest {
         publish_lockfile: bool,
         replace: Vec<(PackageIdSpec, Dependency)>,
         patch: HashMap<Url, Vec<Dependency>>,
-        workspace: WorkspaceConfig,
+        workspace: Rc<WorkspaceConfig>,
         features: Features,
         edition: Edition,
         im_a_teapot: Option<bool>,
         default_run: Option<String>,
-        original: Rc<TomlManifest>,
+        original: Rc<DefinedTomlManifest>,
         metabuild: Option<Vec<String>>,
         resolve_behavior: Option<ResolveBehavior>,
     ) -> Manifest {
@@ -453,7 +462,7 @@ impl Manifest {
     pub fn replace(&self) -> &[(PackageIdSpec, Dependency)] {
         &self.replace
     }
-    pub fn original(&self) -> &TomlManifest {
+    pub fn original(&self) -> &DefinedTomlManifest {
         &self.original
     }
     pub fn patch(&self) -> &HashMap<Url, Vec<Dependency>> {
@@ -463,8 +472,8 @@ impl Manifest {
         self.links.as_deref()
     }
 
-    pub fn workspace_config(&self) -> &WorkspaceConfig {
-        &self.workspace
+    pub fn workspace_config(&self) -> Rc<WorkspaceConfig> {
+        Rc::clone(&self.workspace)
     }
 
     pub fn features(&self) -> &Features {
@@ -538,7 +547,7 @@ impl VirtualManifest {
     pub fn new(
         replace: Vec<(PackageIdSpec, Dependency)>,
         patch: HashMap<Url, Vec<Dependency>>,
-        workspace: WorkspaceConfig,
+        workspace: Rc<WorkspaceConfig>,
         profiles: Option<TomlProfiles>,
         features: Features,
         resolve_behavior: Option<ResolveBehavior>,
@@ -562,8 +571,8 @@ impl VirtualManifest {
         &self.patch
     }
 
-    pub fn workspace_config(&self) -> &WorkspaceConfig {
-        &self.workspace
+    pub fn workspace_config(&self) -> Rc<WorkspaceConfig> {
+        Rc::clone(&self.workspace)
     }
 
     pub fn profiles(&self) -> Option<&TomlProfiles> {

src/cargo/core/mod.rs

@@ -28,4 +28,4 @@ pub mod resolver;
 pub mod shell;
 pub mod source;
 pub mod summary;
-mod workspace;
+pub mod workspace;

src/cargo/core/package.rs

@@ -240,7 +240,9 @@ impl Package {
         let manifest = self
             .manifest()
             .original()
-            .prepare_for_publish(ws, self.root())?;
+            .prepare_for_publish(ws, self.manifest_path())?
+            .into_toml_manifest();
+
         let toml = toml::to_string(&manifest)?;
         Ok(format!("{}\n{}", MANIFEST_PREAMBLE, toml))
     }