Automatically inherit workspace fields when running cargo new

Signed-off-by: hi-rustin <[email protected]>

Author: 0xPoe

src/cargo/ops/cargo_new.rs

@@ -1,5 +1,6 @@
 use crate::core::{Edition, Shell, Workspace};
 use crate::util::errors::CargoResult;
+use crate::util::important_paths::find_root_manifest_for_wd;
 use crate::util::{existing_vcs_repo, FossilRepo, GitRepo, HgRepo, PijulRepo};
 use crate::util::{restricted_names, Config};
 use anyhow::{anyhow, Context as _};
@@ -772,12 +773,11 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {
     if let Some(registry) = opts.registry {
         let mut array = toml_edit::Array::default();
         array.push(registry);
-        array.decor_mut().set_suffix("\n\n# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html");
         manifest["package"]["publish"] = toml_edit::value(array);
-    } else {
-        manifest["package"]["edition"].as_value_mut().expect("edition is a string value").decor_mut().set_suffix("\n\n# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html");
     }
-    manifest["dependencies"] = toml_edit::Item::Table(toml_edit::Table::new());
+    let mut dep_table = toml_edit::Table::default();
+    dep_table.decor_mut().set_prefix("\n# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html\n\n");
+    manifest["dependencies"] = toml_edit::Item::Table(dep_table);
 
     // Calculate what `[lib]` and `[[bin]]`s we need to append to `Cargo.toml`.
     for i in &opts.source_files {
@@ -795,15 +795,35 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {
                     .push(bin);
             }
         } else if i.relative_path != "src/lib.rs" {
-            manifest["lib"]["name"] = toml_edit::value(i.target_name.clone());
-            manifest["lib"]["path"] = toml_edit::value(i.relative_path.clone());
+            let mut lib = toml_edit::Table::new();
+            lib["name"] = toml_edit::value(i.target_name.clone());
+            lib["path"] = toml_edit::value(i.relative_path.clone());
+            manifest["lib"] = toml_edit::Item::Table(lib);
+        }
+    }
+
+    let manifest_path = path.join("Cargo.toml");
+    if let Ok(root_manifest_path) = find_root_manifest_for_wd(&manifest_path) {
+        let root_manifest = paths::read(&root_manifest_path)?;
+        // Sometimes the root manifest is not a valid manifest, so we only try to parse it if it is.
+        // This should not block the creation of the new project. It is only a best effort to
+        // inherit the workspace package keys.
+        if let Ok(workspace_document) = root_manifest.parse::<toml_edit::Document>() {
+            if let Some(workspace_package_keys) = workspace_document
+                .get("workspace")
+                .and_then(|workspace| workspace.get("package"))
+                .and_then(|package| package.as_table())
+            {
+                update_manifest_with_inherited_workspace_package_keys(
+                    opts,
+                    &mut manifest,
+                    workspace_package_keys,
+                )
+            }
         }
     }
 
-    paths::write(
-        &path.join("Cargo.toml"),
-        format!("{}", manifest.to_string()),
-    )?;
+    paths::write(&manifest_path, format!("{}", manifest.to_string()))?;
 
     // Create all specified source files (with respective parent directories) if they don't exist.
     for i in &opts.source_files {
@@ -862,3 +882,58 @@ mod tests {
 
     Ok(())
 }
+
+fn update_manifest_with_inherited_workspace_package_keys(
+    opts: &MkOptions<'_>,
+    manifest: &mut toml_edit::Document,
+    workspace_package_keys: &toml_edit::Table,
+) {
+    if workspace_package_keys.is_empty() {
+        return;
+    }
+
+    let remove_package_key = |key: &str, manifest: &mut toml_edit::Document| {
+        let package = manifest["package"]
+            .as_table_mut()
+            .expect("package is a table");
+        package.remove(key);
+    };
+
+    let set_workspace_inherited_package_key = |key: &str, manifest: &mut toml_edit::Document| {
+        let package = manifest["package"]
+            .as_table_mut()
+            .expect("package is a table");
+        let mut table = toml_edit::Table::new();
+        table.set_dotted(true);
+        table["workspace"] = toml_edit::value(true);
+        package.insert(key, toml_edit::Item::Table(table));
+    };
+
+    let remove_and_inherit_package_key = |key: &str, manifest: &mut toml_edit::Document| {
+        remove_package_key(key, manifest);
+        set_workspace_inherited_package_key(key, manifest);
+    };
+
+    // Try inherit the edition from the workspace if it is not specified.
+    if opts.edition.is_none() && workspace_package_keys.contains_key("edition") {
+        remove_and_inherit_package_key("edition", manifest);
+    }
+
+    // Try inherit the version from the workspace.
+    if workspace_package_keys.contains_key("version") {
+        remove_and_inherit_package_key("version", manifest);
+    }
+
+    // Try inherit the publish from the workspace if it is not specified.
+    if opts.registry.is_none() && workspace_package_keys.contains_key("publish") {
+        remove_and_inherit_package_key("publish", manifest);
+    }
+
+    // Inherit other keys from the workspace.
+    for (key, _) in workspace_package_keys
+        .iter()
+        .filter(|(key, _)| !["edition", "version", "publish"].contains(key))
+    {
+        set_workspace_inherited_package_key(key, manifest);
+    }
+}