Detect cargo add foo will inherit a workspace dependency

src/cargo/ops/cargo_add/mod.rs

@@ -32,7 +32,7 @@ use dependency::RegistrySource;
 use dependency::Source;
 use manifest::LocalManifest;
 
-use crate::ops::cargo_add::dependency::MaybeWorkspace;
+use crate::ops::cargo_add::dependency::{MaybeWorkspace, WorkspaceSource};
 pub use manifest::DepTable;
 
 /// Information on what dependencies should be added
@@ -281,7 +281,11 @@ fn resolve_dependency(
     };
 
     if dependency.source().is_none() {
-        if let Some(package) = ws.members().find(|p| p.name().as_str() == dependency.name) {
+        // Checking for a workspace dependency happens first since a member could be specified
+        // in the workspace dependencies table as a dependency
+        if let Some(_dep) = find_workspace_dep(dependency.toml_key(), ws.root_manifest()).ok() {
+            dependency = dependency.set_source(WorkspaceSource::new());
+        } else if let Some(package) = ws.members().find(|p| p.name().as_str() == dependency.name) {
             // Only special-case workspaces when the user doesn't provide any extra
             // information, otherwise, trust the user.
             let mut src = PathSource::new(package.root());
@@ -543,31 +547,7 @@ fn populate_available_features(
     let query = dependency.query(config)?;
     let query = match query {
         MaybeWorkspace::Workspace(_workspace) => {
-            let manifest = LocalManifest::try_new(ws.root_manifest())?;
-            let manifest = manifest
-                .data
-                .as_item()
-                .as_table_like()
-                .context("could not make `manifest.data` into a table")?;
-            let workspace = manifest
-                .get("workspace")
-                .context("could not find `workspace`")?
-                .as_table_like()
-                .context("could not make `manifest.data.workspace` into a table")?;
-            let dependencies = workspace
-                .get("dependencies")
-                .context("could not find `dependencies` table in `workspace`")?
-                .as_table_like()
-                .context("could not make `dependencies` into a table")?;
-            let dep_item = dependencies.get(dependency.toml_key()).context(format!(
-                "could not find {} in `workspace.dependencies`",
-                dependency.toml_key()
-            ))?;
-            let dep = Dependency::from_toml(
-                ws.root_manifest().parent().unwrap(),
-                dependency.toml_key(),
-                dep_item,
-            )?;
+            let dep = find_workspace_dep(dependency.toml_key(), ws.root_manifest())?;
             if let Some(features) = dep.features.clone() {
                 dependency = dependency.set_inherited_features(features);
             }
@@ -712,3 +692,27 @@ fn is_sorted(mut it: impl Iterator<Item = impl PartialOrd>) -> bool {
 
     true
 }
+
+fn find_workspace_dep(toml_key: &str, root_manifest: &Path) -> CargoResult<Dependency> {
+    let manifest = LocalManifest::try_new(root_manifest)?;
+    let manifest = manifest
+        .data
+        .as_item()
+        .as_table_like()
+        .context("could not make `manifest.data` into a table")?;
+    let workspace = manifest
+        .get("workspace")
+        .context("could not find `workspace`")?
+        .as_table_like()
+        .context("could not make `manifest.data.workspace` into a table")?;
+    let dependencies = workspace
+        .get("dependencies")
+        .context("could not find `dependencies` table in `workspace`")?
+        .as_table_like()
+        .context("could not make `dependencies` into a table")?;
+    let dep_item = dependencies.get(toml_key).context(format!(
+        "could not find {} in `workspace.dependencies`",
+        toml_key
+    ))?;
+    Dependency::from_toml(root_manifest.parent().unwrap(), toml_key, dep_item)
+}

tests/snapshots/add/detect_workspace_inherit.in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency"}

tests/snapshots/add/detect_workspace_inherit.in/dependency/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit.in/primary/Cargo.toml

@@ -0,0 +1,5 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit.out/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency"}

tests/snapshots/add/detect_workspace_inherit.out/dependency/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit.out/primary/Cargo.toml

@@ -0,0 +1,8 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"
+
+[dependencies]
+foo.workspace = true

tests/snapshots/add/detect_workspace_inherit.stderr

@@ -0,0 +1 @@
+      Adding foo (workspace) to dependencies.

tests/snapshots/add/detect_workspace_inherit_features.in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency", features = ["merge"] }

tests/snapshots/add/detect_workspace_inherit_features.in/dependency/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "foo"
+version = "0.0.0"
+
+[features]
+default-base = []
+default-test-base = []
+default-merge-base = []
+default = ["default-base", "default-test-base", "default-merge-base"]
+test-base = []
+test = ["test-base", "default-test-base"]
+merge-base = []
+merge = ["merge-base", "default-merge-base"]
+unrelated = []

tests/snapshots/add/detect_workspace_inherit_features.in/primary/Cargo.toml

@@ -0,0 +1,5 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit_features.out/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency", features = ["merge"] }

tests/snapshots/add/detect_workspace_inherit_features.out/dependency/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "foo"
+version = "0.0.0"
+
+[features]
+default-base = []
+default-test-base = []
+default-merge-base = []
+default = ["default-base", "default-test-base", "default-merge-base"]
+test-base = []
+test = ["test-base", "default-test-base"]
+merge-base = []
+merge = ["merge-base", "default-merge-base"]
+unrelated = []

tests/snapshots/add/detect_workspace_inherit_features.out/primary/Cargo.toml

@@ -0,0 +1,8 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"
+
+[dependencies]
+foo = { workspace = true, features = ["test"] }

tests/snapshots/add/detect_workspace_inherit_features.stderr

@@ -0,0 +1,10 @@
+      Adding foo (workspace) to dependencies.
+             Features:
+             + default-base
+             + default-merge-base
+             + default-test-base
+             + merge
+             + merge-base
+             + test
+             + test-base
+             - unrelated

tests/snapshots/add/detect_workspace_inherit_optional.in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency"}

tests/snapshots/add/detect_workspace_inherit_optional.in/dependency/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit_optional.in/primary/Cargo.toml

@@ -0,0 +1,5 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit_optional.out/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency"}

tests/snapshots/add/detect_workspace_inherit_optional.out/dependency/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/detect_workspace_inherit_optional.out/primary/Cargo.toml

@@ -0,0 +1,8 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"
+
+[dependencies]
+foo = { workspace = true, optional = true }

tests/snapshots/add/detect_workspace_inherit_optional.stderr

@@ -0,0 +1 @@
+      Adding foo (workspace) to optional dependencies.

tests/testsuite/cargo_add.rs

@@ -262,6 +262,77 @@ fn require_weak() {
     assert().subset_matches("tests/snapshots/add/require_weak.out", &project_root);
 }
 
+#[cargo_test]
+fn detect_workspace_inherit() {
+    init_registry();
+    let project = Project::from_template("tests/snapshots/add/detect_workspace_inherit.in");
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo()
+        .masquerade_as_nightly_cargo()
+        .arg("add")
+        .args(["foo", "-p", "bar"])
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit.stdout")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit.stderr");
+
+    assert().subset_matches(
+        "tests/snapshots/add/detect_workspace_inherit.out",
+        &project_root,
+    );
+}
+
+#[cargo_test]
+fn detect_workspace_inherit_features() {
+    init_registry();
+    let project =
+        Project::from_template("tests/snapshots/add/detect_workspace_inherit_features.in");
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo()
+        .masquerade_as_nightly_cargo()
+        .arg("add")
+        .args(["foo", "-p", "bar", "--features", "test"])
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_features.stdout")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_features.stderr");
+
+    assert().subset_matches(
+        "tests/snapshots/add/detect_workspace_inherit_features.out",
+        &project_root,
+    );
+}
+
+#[cargo_test]
+fn detect_workspace_inherit_optional() {
+    init_registry();
+    let project =
+        Project::from_template("tests/snapshots/add/detect_workspace_inherit_optional.in");
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo()
+        .masquerade_as_nightly_cargo()
+        .arg("add")
+        .args(["foo", "-p", "bar", "--optional"])
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_optional.stdout")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_optional.stderr");
+
+    assert().subset_matches(
+        "tests/snapshots/add/detect_workspace_inherit_optional.out",
+        &project_root,
+    );
+}
+
 #[cargo_test]
 fn dev() {
     init_registry();