From a2232dc0e2e7fd836087904c90e626016bc138e3 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Sun, 17 Jul 2022 17:11:34 -0500
Subject: [PATCH] Stabilize workspace inheritance

---
 src/cargo/core/features.rs                    |   2 +-
 src/cargo/util/toml/mod.rs                    |  65 +++---
 .../src/reference/specifying-dependencies.md  |  43 ++++
 src/doc/src/reference/unstable.md             | 192 +-----------------
 src/doc/src/reference/workspaces.md           |  87 ++++++++
 .../in/primary/Cargo.toml                     |   2 -
 .../cargo_add/detect_workspace_inherit/mod.rs |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../detect_workspace_inherit_features/mod.rs  |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../detect_workspace_inherit_optional/mod.rs  |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../invalid_key_inherit_dependency/mod.rs     |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../mod.rs                                    |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../mod.rs                                    |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../cargo_add/merge_activated_features/mod.rs |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../overwrite_inherit_features_noop/mod.rs    |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../cargo_add/overwrite_inherit_noop/mod.rs   |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../overwrite_inherit_optional_noop/mod.rs    |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../cargo_add/overwrite_workspace_dep/mod.rs  |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../overwrite_workspace_dep_features/mod.rs   |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../in/primary/Cargo.toml                     |   2 -
 .../unknown_inherited_feature/mod.rs          |   1 -
 .../out/primary/Cargo.toml                    |   2 -
 .../testsuite/inheritable_workspace_fields.rs | 177 +---------------
 45 files changed, 172 insertions(+), 459 deletions(-)

diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index da5d36eb5129..0400e89a1e46 100644
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@@ -416,7 +416,7 @@ features! {
     (unstable, profile_rustflags, "", "reference/unstable.html#profile-rustflags-option"),
 
     // Allow specifying rustflags directly in a profile
-    (unstable, workspace_inheritance, "", "reference/unstable.html#workspace-inheritance"),
+    (stable, workspace_inheritance, "1.64", "reference/unstable.html#workspace-inheritance"),
 }
 
 pub struct Feature {
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index ab63420ab241..e71ca757941a 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -1017,19 +1017,16 @@ pub enum MaybeWorkspace<T> {
 impl<T> MaybeWorkspace<T> {
     fn resolve<'a>(
         self,
-        cargo_features: &Features,
         label: &str,
         get_ws_field: impl FnOnce() -> CargoResult<T>,
     ) -> CargoResult<T> {
         match self {
             MaybeWorkspace::Defined(value) => Ok(value),
-            MaybeWorkspace::Workspace(TomlWorkspaceField { workspace: true }) => {
-                cargo_features.require(Feature::workspace_inheritance())?;
-                get_ws_field().context(format!(
+            MaybeWorkspace::Workspace(TomlWorkspaceField { workspace: true }) => get_ws_field()
+                .context(format!(
                     "error inheriting `{}` from workspace root manifest's `workspace.package.{}`",
                     label, label
-                ))
-            }
+                )),
             MaybeWorkspace::Workspace(TomlWorkspaceField { workspace: false }) => Err(anyhow!(
                 "`workspace=false` is unsupported for `package.{}`",
                 label,
@@ -1592,7 +1589,7 @@ impl TomlManifest {
         let version = project
             .version
             .clone()
-            .resolve(&features, "version", || inherit()?.version())?;
+            .resolve("version", || inherit()?.version())?;
 
         project.version = MaybeWorkspace::Defined(version.clone());
 
@@ -1600,7 +1597,7 @@ impl TomlManifest {
 
         let edition = if let Some(edition) = project.edition.clone() {
             let edition: Edition = edition
-                .resolve(&features, "edition", || inherit()?.edition())?
+                .resolve("edition", || inherit()?.edition())?
                 .parse()
                 .with_context(|| "failed to parse the `edition` key")?;
             project.edition = Some(MaybeWorkspace::Defined(edition.to_string()));
@@ -1625,7 +1622,7 @@ impl TomlManifest {
         let rust_version = if let Some(rust_version) = &project.rust_version {
             let rust_version = rust_version
                 .clone()
-                .resolve(&features, "rust_version", || inherit()?.rust_version())?;
+                .resolve("rust_version", || inherit()?.rust_version())?;
             let req = match semver::VersionReq::parse(&rust_version) {
                 // Exclude semver operators like `^` and pre-release identifiers
                 Ok(req) if rust_version.chars().all(|c| c.is_ascii_digit() || c == '.') => req,
@@ -1716,7 +1713,6 @@ impl TomlManifest {
         };
 
         fn process_dependencies(
-            features: &Features,
             cx: &mut Context<'_, '_>,
             new_deps: Option<&BTreeMap<String, TomlDependency>>,
             kind: Option<DepKind>,
@@ -1736,7 +1732,7 @@ impl TomlManifest {
 
             let mut deps: BTreeMap<String, TomlDependency> = BTreeMap::new();
             for (n, v) in dependencies.iter() {
-                let resolved = v.clone().resolve(features, n, cx, || inherit())?;
+                let resolved = v.clone().resolve(n, cx, || inherit())?;
                 let dep = resolved.to_dependency(n, cx, kind)?;
                 validate_package_name(dep.name_in_toml().as_str(), "dependency name", "")?;
                 cx.deps.push(dep);
@@ -1747,7 +1743,6 @@ impl TomlManifest {
 
         // Collect the dependencies.
         let dependencies = process_dependencies(
-            &features,
             &mut cx,
             me.dependencies.as_ref(),
             None,
@@ -1762,7 +1757,6 @@ impl TomlManifest {
             .as_ref()
             .or_else(|| me.dev_dependencies2.as_ref());
         let dev_deps = process_dependencies(
-            &features,
             &mut cx,
             dev_deps,
             Some(DepKind::Development),
@@ -1777,7 +1771,6 @@ impl TomlManifest {
             .as_ref()
             .or_else(|| me.build_dependencies2.as_ref());
         let build_deps = process_dependencies(
-            &features,
             &mut cx,
             build_deps,
             Some(DepKind::Build),
@@ -1793,7 +1786,6 @@ impl TomlManifest {
                 Some(platform)
             };
             let deps = process_dependencies(
-                &features,
                 &mut cx,
                 platform.dependencies.as_ref(),
                 None,
@@ -1809,7 +1801,6 @@ impl TomlManifest {
                 .as_ref()
                 .or_else(|| platform.build_dependencies2.as_ref());
             let build_deps = process_dependencies(
-                &features,
                 &mut cx,
                 build_deps,
                 Some(DepKind::Build),
@@ -1825,7 +1816,6 @@ impl TomlManifest {
                 .as_ref()
                 .or_else(|| platform.dev_dependencies2.as_ref());
             let dev_deps = process_dependencies(
-                &features,
                 &mut cx,
                 dev_deps,
                 Some(DepKind::Development),
@@ -1872,13 +1862,13 @@ impl TomlManifest {
         let exclude = project
             .exclude
             .clone()
-            .map(|mw| mw.resolve(&features, "exclude", || inherit()?.exclude()))
+            .map(|mw| mw.resolve("exclude", || inherit()?.exclude()))
             .transpose()?
             .unwrap_or_default();
         let include = project
             .include
             .clone()
-            .map(|mw| mw.resolve(&features, "include", || inherit()?.include()))
+            .map(|mw| mw.resolve("include", || inherit()?.include()))
             .transpose()?
             .unwrap_or_default();
         let empty_features = BTreeMap::new();
@@ -1895,67 +1885,63 @@ impl TomlManifest {
             description: project
                 .description
                 .clone()
-                .map(|mw| mw.resolve(&features, "description", || inherit()?.description()))
+                .map(|mw| mw.resolve("description", || inherit()?.description()))
                 .transpose()?,
             homepage: project
                 .homepage
                 .clone()
-                .map(|mw| mw.resolve(&features, "homepage", || inherit()?.homepage()))
+                .map(|mw| mw.resolve("homepage", || inherit()?.homepage()))
                 .transpose()?,
             documentation: project
                 .documentation
                 .clone()
-                .map(|mw| mw.resolve(&features, "documentation", || inherit()?.documentation()))
+                .map(|mw| mw.resolve("documentation", || inherit()?.documentation()))
                 .transpose()?,
             readme: readme_for_project(
                 package_root,
                 project
                     .readme
                     .clone()
-                    .map(|mw| mw.resolve(&features, "readme", || inherit()?.readme(package_root)))
+                    .map(|mw| mw.resolve("readme", || inherit()?.readme(package_root)))
                     .transpose()?,
             ),
             authors: project
                 .authors
                 .clone()
-                .map(|mw| mw.resolve(&features, "authors", || inherit()?.authors()))
+                .map(|mw| mw.resolve("authors", || inherit()?.authors()))
                 .transpose()?
                 .unwrap_or_default(),
             license: project
                 .license
                 .clone()
-                .map(|mw| mw.resolve(&features, "license", || inherit()?.license()))
+                .map(|mw| mw.resolve("license", || inherit()?.license()))
                 .transpose()?,
             license_file: project
                 .license_file
                 .clone()
-                .map(|mw| {
-                    mw.resolve(&features, "license", || {
-                        inherit()?.license_file(package_root)
-                    })
-                })
+                .map(|mw| mw.resolve("license", || inherit()?.license_file(package_root)))
                 .transpose()?,
             repository: project
                 .repository
                 .clone()
-                .map(|mw| mw.resolve(&features, "repository", || inherit()?.repository()))
+                .map(|mw| mw.resolve("repository", || inherit()?.repository()))
                 .transpose()?,
             keywords: project
                 .keywords
                 .clone()
-                .map(|mw| mw.resolve(&features, "keywords", || inherit()?.keywords()))
+                .map(|mw| mw.resolve("keywords", || inherit()?.keywords()))
                 .transpose()?
                 .unwrap_or_default(),
             categories: project
                 .categories
                 .clone()
-                .map(|mw| mw.resolve(&features, "categories", || inherit()?.categories()))
+                .map(|mw| mw.resolve("categories", || inherit()?.categories()))
                 .transpose()?
                 .unwrap_or_default(),
             badges: me
                 .badges
                 .clone()
-                .map(|mw| mw.resolve(&features, "badges", || inherit()?.badges()))
+                .map(|mw| mw.resolve("badges", || inherit()?.badges()))
                 .transpose()?
                 .unwrap_or_default(),
             links: project.links.clone(),
@@ -2015,11 +2001,10 @@ impl TomlManifest {
             profiles.validate(&features, &mut warnings)?;
         }
 
-        let publish = project.publish.clone().map(|publish| {
-            publish
-                .resolve(&features, "publish", || inherit()?.publish())
-                .unwrap()
-        });
+        let publish = project
+            .publish
+            .clone()
+            .map(|publish| publish.resolve("publish", || inherit()?.publish()).unwrap());
 
         project.publish = publish.clone().map(|p| MaybeWorkspace::Defined(p));
 
@@ -2479,7 +2464,6 @@ impl<P: ResolveToPath + Clone> TomlDependency<P> {
 impl TomlDependency {
     fn resolve<'a>(
         self,
-        cargo_features: &Features,
         label: &str,
         cx: &mut Context<'_, '_>,
         get_inheritable: impl FnOnce() -> CargoResult<&'a InheritableFields>,
@@ -2492,7 +2476,6 @@ impl TomlDependency {
                 features,
                 optional,
             }) => {
-                cargo_features.require(Feature::workspace_inheritance())?;
                 let inheritable = get_inheritable()?;
                 inheritable.get_dependency(label).context(format!(
                     "error reading `dependencies.{}` from workspace root manifest's `workspace.dependencies.{}`",
diff --git a/src/doc/src/reference/specifying-dependencies.md b/src/doc/src/reference/specifying-dependencies.md
index f1188f6d6fb6..3cd4ae473123 100644
--- a/src/doc/src/reference/specifying-dependencies.md
+++ b/src/doc/src/reference/specifying-dependencies.md
@@ -454,8 +454,51 @@ following to the above manifest:
 log-debug = ['bar/log-debug'] # using 'foo/log-debug' would be an error!
 ```
 
+### Inheriting a dependency from a workspace
+
+Dependencies can be inherited from a workspace by specifying the
+dependency in the workspace's [`[workspace.dependencies]`][workspace.dependencies] table.
+After that add it to the `[dependencies]` table with `dep.workspace = true`.
+
+The `workspace` key can be defined with:
+- [`optional`][optional]: Note that the`[workspace.dependencies]` table is not allowed to specify `optional`.
+- [`features`][features]: These are additive with the features declared in the `[workspace.dependencies]`
+
+The `workspace` key cannot be defined with:
+
+|                  |                    | 
+|------------------|--------------------|
+| `branch`         | `default-features` |
+| `git`            | `package`          |
+| `path`           | `registry`         |
+| `registry-index` | `rev`              |
+| `tag`            | `version`          |
+
+
+Dependencies in the `[dependencies]`, `[dev-dependencies]`, `[build-dependencies]`, and
+`[target."...".dependencies]` sections support the ability to reference the
+`[workspace.dependencies]` definition of dependencies.
+
+Example:
+```toml
+[dependencies]
+dep.workspace = true
+dep2 = { workspace = true, features = ["fancy"] }
+dep3 = { workspace = true, optional = true }
+dep4 = { workspace = true, optional = true, features = ["fancy"] }
+
+[build-dependencies]
+dep-build.workspace = true
+
+[dev-dependencies]
+dep-dev.workspace = true
+```
+
 [crates.io]: https://crates.io/
 [dev-dependencies]: #development-dependencies
+[workspace.dependencies]: workspaces.md#the-workspacedependencies-table
+[optional]: features.md#optional-dependencies
+[features]: features.md
 
 <script>
 (function() {
diff --git a/src/doc/src/reference/unstable.md b/src/doc/src/reference/unstable.md
index 6c83cf79d804..a04c51fdc769 100644
--- a/src/doc/src/reference/unstable.md
+++ b/src/doc/src/reference/unstable.md
@@ -68,7 +68,6 @@ Each new feature described below should explain how to use it.
     * [avoid-dev-deps](#avoid-dev-deps) — Prevents the resolver from including dev-dependencies during resolution.
     * [minimal-versions](#minimal-versions) — Forces the resolver to use the lowest compatible version instead of the highest.
     * [public-dependency](#public-dependency) — Allows dependencies to be classified as either public or private.
-    * [workspace-inheritance](#workspace-inheritance) - Allow workspace members to share fields and dependencies
 * Output behavior
     * [out-dir](#out-dir) — Adds a directory where artifacts are copied to.
     * [terminal-width](#terminal-width) — Tells rustc the width of the terminal so that long diagnostic messages can be truncated to be more readable.
@@ -1155,188 +1154,6 @@ with a warning.
 If you want to integrate with Cargo features, use `-Zcheck-cfg=features` instead of
 trying to do it manually with this option.
 
-### workspace-inheritance
-
-* RFC: [#2906](https://github.com/rust-lang/rfcs/blob/master/text/2906-cargo-workspace-deduplicate.md)
-* Tracking Issue: [#8415](https://github.com/rust-lang/cargo/issues/8415)
-* [Status](https://github.com/rust-lang/cargo/issues/8415#issuecomment-1112618913)
-* [Example Port](https://github.com/clap-rs/clap/pull/3719)
-
-### Testing notes
-
-Target audience for testing
-* Maintainer who has a workspace
-* *(optional)* Project depends on nightly toolchain
-
-In preparing to stabilize, we are wanting to better understand
-* If there were any pain points in porting your project
-* Any errors or bugs that you found in testing
-* Performance concerns
-* Gaps in documentation
-* Thoughts on how you feel this feature will work in practice
-
-Please provide feedback on the [tracking issue](https://github.com/rust-lang/cargo/issues/8415)
-or create an issue for any bugs encountered.
-
-To get started
-1. Have a (recent) nightly version installed
-2. Place `cargo-features = ["workspace-inheritance"]` at the top of any `Cargo.toml` you 
-plan to use this feature in
-3. Create a `[workspace.package]` and `[workspace.dependencies]` in your workspace `Cargo.toml`
-4. Move any package keys or dependencies you feel should be shared between crates to their 
-respective workspace table
-5. Change any keys you want to inherit to `{key}.workspace = true` in the member `Cargo.toml`
-6. run `cargo +nightly check`
-
-An example port has been made [in this PR](https://github.com/clap-rs/clap/pull/3719) as
-a "real-life" guide.
-
-### The `workspace.package` table
-
-*Stabilization*: This would be in [`workspaces.md`][workspaces], under
-[The `workspace.metadata` table][workspace-metadata-table]
-
-The `workspace.package` table is where you define keys that can be
-inherited by members of a workspace. These keys can be inherited by
-defining them in the member package with `{key}.workspace = true`.
-
-Keys that are supported:
-
-|                |                 |
-|----------------|-----------------|
-| `authors`      | `categories`    |
-| `description`  | `documentation` |
-| `edition`      | `exclude`       |
-| `homepage`     | `include`       |
-| `keywords`     | `license`       |
-| `license-file` | `publish`       |
-| `readme`       | `repository`    |
-| `rust-version` | `version`       |
-
-- `license-file` and `readme` are relative to the workspace root
-- `include` and `exclude` are relative to your package root
-
-Example:
-```toml
-# [PROJECT_DIR]/Cargo.toml
-[workspace]
-members = ["bar"]
-
-[workspace.package]
-version = "1.2.3"
-authors = ["Nice Folks"]
-description = "..."
-documentation = "https://example.github.io/example"
-```
-
-```toml
-# [PROGJCT_DIR]/bar/Cargo.toml
-cargo-features = ["workspace-inheritance"]
-
-[package]
-name = "bar"
-version.workspace = true
-authors.workspace = true
-description.workspace = true
-documentation.workspace = true
-```
-
-
-### The `workspace.dependencies` table
-
-The `workspace.dependencies` table is where you define dependencies to be
-inherited by members of a workspace. 
-
-Specifying a workspace dependency is similar to [package dependencies][specifying-dependencies] except:
-- Dependencies from this table cannot be declared as `optional`
-- [`features`][features] declared in this table are additive with the `features` from `[dependencies]`
-
-You can then [inherit the workspace dependency as a package dependency][inheriting-a-dependency-from-a-workspace]
-
-Example:
-```toml
-# [PROJECT_DIR]/Cargo.toml
-[workspace]
-members = ["bar"]
-
-[workspace.dependencies]
-dep = { version = "0.1", features = ["fancy"] }
-dep-build = "0.8"
-dep-dev = "0.5.2"
-```
-
-```toml
-# [PROJECT_DIR]/bar/Cargo.toml
-cargo-features = ["workspace-inheritance"]
-
-[project]
-name = "bar"
-version = "0.2.0"
-
-[dependencies]
-dep = { workspace = true, features = ["dancy"] }
-
-[build-dependencies]
-dep-build.workspace = true
-
-[dev-dependencies]
-dep-dev.workspace = true
-```
-
-[inheriting-a-dependency-from-a-workspace]: #inheriting-a-dependency-from-a-workspace
-[workspace-metadata-table]: workspaces.md#the-workspacemetadata-table
-[workspaces]: workspaces.md
-
-
-### Inheriting a dependency from a workspace
-
-*Stabilization*: This would be in [`specifying-dependencies.md`][specifying-dependencies],
-under [Renaming dependencies in Cargo.toml][renaming-dependencies-in-cargotoml]
-
-Dependencies can be inherited from a workspace by specifying the
-dependency in the workspace's [`[workspace.dependencies]`][workspace.dependencies] table.
-After that add it to the `[dependencies]` table with `dep.workspace = true`.
-
-The `workspace` key can be defined with:
-- [`optional`][optional]: Note that the`[workspace.dependencies]` table is not allowed to specify `optional`.
-- [`features`][features]: These are additive with the features declared in the `[workspace.dependencies]`
-
-The `workspace` key cannot be defined with:
-
-|                  |                    | 
-|------------------|--------------------|
-| `branch`         | `default-features` |
-| `git`            | `package`          |
-| `path`           | `registry`         |
-| `registry-index` | `rev`              |
-| `tag`            | `version`          |
-
-
-Dependencies in the `[dependencies]`, `[dev-dependencies]`, `[build-dependencies]`, and
-`[target."...".dependencies]` sections support the ability to reference the
-`[workspace.dependencies]` definition of dependencies.
-
-Example:
-```toml
-[dependencies]
-dep.workspace = true
-dep2 = { workspace = true, features = ["fancy"] }
-dep3 = { workspace = true, optional = true }
-dep4 = { workspace = true, optional = true, features = ["fancy"] }
-
-[build-dependencies]
-dep-build.workspace = true
-
-[dev-dependencies]
-dep-dev.workspace = true
-```
-
-[features]: features.md
-[optional]: features.md#optional-dependencies
-[workspace.dependencies]: #the-workspacedependencies-table
-[specifying-dependencies]: specifying-dependencies.md
-[renaming-dependencies-in-cargotoml]: specifying-dependencies.md#renaming-dependencies-in-cargotoml
-
 ## Stabilized and removed features
 
 ### Compile progress
@@ -1536,3 +1353,12 @@ setting the default target platform triples.
 The `--crate-type` flag for `cargo rustc` has been stabilized in the 1.64
 release. See the [`cargo rustc` documentation](../commands/cargo-rustc.md)
 for more information.
+
+
+### Workspace Inheritance
+
+Workspace Inheritance has been stabilized in the 1.64 release.
+See [workspace.package](workspaces.md#the-workspacepackage-table), 
+[workspace.dependencies](workspaces.md#the-workspacedependencies-table), 
+and [inheriting-a-dependency-from-a-workspace](specifying-dependencies.md#inheriting-a-dependency-from-a-workspace)
+for more information.
\ No newline at end of file
diff --git a/src/doc/src/reference/workspaces.md b/src/doc/src/reference/workspaces.md
index 97472e352bd0..79c4664c0d40 100644
--- a/src/doc/src/reference/workspaces.md
+++ b/src/doc/src/reference/workspaces.md
@@ -112,6 +112,90 @@ external tools may wish to use them in a consistent fashion, such as referring
 to the data in `workspace.metadata` if data is missing from `package.metadata`,
 if that makes sense for the tool in question.
 
+### The `workspace.package` table
+
+The `workspace.package` table is where you define keys that can be
+inherited by members of a workspace. These keys can be inherited by
+defining them in the member package with `{key}.workspace = true`.
+
+Keys that are supported:
+
+|                |                 |
+|----------------|-----------------|
+| `authors`      | `categories`    |
+| `description`  | `documentation` |
+| `edition`      | `exclude`       |
+| `homepage`     | `include`       |
+| `keywords`     | `license`       |
+| `license-file` | `publish`       |
+| `readme`       | `repository`    |
+| `rust-version` | `version`       |
+
+- `license-file` and `readme` are relative to the workspace root
+- `include` and `exclude` are relative to your package root
+
+Example:
+```toml
+# [PROJECT_DIR]/Cargo.toml
+[workspace]
+members = ["bar"]
+
+[workspace.package]
+version = "1.2.3"
+authors = ["Nice Folks"]
+description = "..."
+documentation = "https://example.github.io/example"
+```
+
+```toml
+# [PROGJCT_DIR]/bar/Cargo.toml
+[package]
+name = "bar"
+version.workspace = true
+authors.workspace = true
+description.workspace = true
+documentation.workspace = true
+```
+
+### The `workspace.dependencies` table
+
+The `workspace.dependencies` table is where you define dependencies to be
+inherited by members of a workspace.
+
+Specifying a workspace dependency is similar to [package dependencies][specifying-dependencies] except:
+- Dependencies from this table cannot be declared as `optional`
+- [`features`][features] declared in this table are additive with the `features` from `[dependencies]`
+
+You can then [inherit the workspace dependency as a package dependency][inheriting-a-dependency-from-a-workspace]
+
+Example:
+```toml
+# [PROJECT_DIR]/Cargo.toml
+[workspace]
+members = ["bar"]
+
+[workspace.dependencies]
+dep = { version = "0.1", features = ["fancy"] }
+dep-build = "0.8"
+dep-dev = "0.5.2"
+```
+
+```toml
+# [PROJECT_DIR]/bar/Cargo.toml
+[project]
+name = "bar"
+version = "0.2.0"
+
+[dependencies]
+dep = { workspace = true, features = ["dancy"] }
+
+[build-dependencies]
+dep-build.workspace = true
+
+[dev-dependencies]
+dep-dev.workspace = true
+```
+
 [package]: manifest.md#the-package-section
 [package-metadata]: manifest.md#the-metadata-table
 [output directory]: ../guide/build-cache.md
@@ -122,3 +206,6 @@ if that makes sense for the tool in question.
 [`package.workspace`]: manifest.md#the-workspace-field
 [globs]: https://docs.rs/glob/0.3.0/glob/struct.Pattern.html
 [`cargo build`]: ../commands/cargo-build.md
+[specifying-dependencies]: specifying-dependencies.md
+[features]: features.md
+[inheriting-a-dependency-from-a-workspace]: specifying-dependencies.md#inheriting-a-dependency-from-a-workspace
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/in/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit/in/primary/Cargo.toml
index b5022b62a374..b867edbbed18 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
\ No newline at end of file
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
index a7987f5206cd..340296f7ef0e 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
@@ -13,7 +13,6 @@ fn detect_workspace_inherit() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit/out/primary/Cargo.toml
index c97da880af7e..a5740941b2c4 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/in/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_features/in/primary/Cargo.toml
index b5022b62a374..b867edbbed18 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
\ No newline at end of file
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
index c4fafc8dd683..09888ff97413 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
@@ -13,7 +13,6 @@ fn detect_workspace_inherit_features() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar", "--features", "test"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_features/out/primary/Cargo.toml
index 0f91d71a3c83..fb4a12619199 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/in/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/in/primary/Cargo.toml
index b5022b62a374..b867edbbed18 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
\ No newline at end of file
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
index 0a5f1309f0a3..d6cd3ac83cb9 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
@@ -13,7 +13,6 @@ fn detect_workspace_inherit_optional() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar", "--optional"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/out/primary/Cargo.toml
index b3b1ccc5b117..6dd7fb6d65d0 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/in/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/in/primary/Cargo.toml
index 668cbd854dba..dd275f440b81 100644
--- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
index 020b1a576e42..4efbaf97479c 100644
--- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
@@ -11,7 +11,6 @@ fn invalid_key_inherit_dependency() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "--default-features", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/out/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/out/primary/Cargo.toml
index 668cbd854dba..dd275f440b81 100644
--- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
index c97da880af7e..a5740941b2c4 100644
--- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
index d3dd98b687f4..c0a187eb0a14 100644
--- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
@@ -11,7 +11,6 @@ fn invalid_key_overwrite_inherit_dependency() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "--default-features", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
index c97da880af7e..a5740941b2c4 100644
--- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
index 668cbd854dba..dd275f440b81 100644
--- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
index 18825db7a402..30dedc50ab10 100644
--- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
@@ -11,7 +11,6 @@ fn invalid_key_rename_inherit_dependency() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["--rename", "foo", "foo-alt", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
index 668cbd854dba..dd275f440b81 100644
--- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/merge_activated_features/in/primary/Cargo.toml b/tests/testsuite/cargo_add/merge_activated_features/in/primary/Cargo.toml
index 7ab3f9dd2c18..a131c946d9ab 100644
--- a/tests/testsuite/cargo_add/merge_activated_features/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/merge_activated_features/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
index e1371ac669a9..dcd6fac269c7 100644
--- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs
+++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
@@ -11,7 +11,6 @@ fn merge_activated_features() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["zworkspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/merge_activated_features/out/primary/Cargo.toml b/tests/testsuite/cargo_add/merge_activated_features/out/primary/Cargo.toml
index 0f91d71a3c83..fb4a12619199 100644
--- a/tests/testsuite/cargo_add/merge_activated_features/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/merge_activated_features/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/in/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/in/primary/Cargo.toml
index 7ab3f9dd2c18..a131c946d9ab 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
index 63cb2fa7b989..116b5d7d335c 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
@@ -11,7 +11,6 @@ fn overwrite_inherit_features_noop() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/out/primary/Cargo.toml
index 0f91d71a3c83..fb4a12619199 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/in/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_noop/in/primary/Cargo.toml
index aaadbceb1638..2ac789d55543 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_noop/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
index 1f8c24d99799..95d0b2a3ebd3 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
@@ -13,7 +13,6 @@ fn overwrite_inherit_noop() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_noop/out/primary/Cargo.toml
index c97da880af7e..a5740941b2c4 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_noop/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/in/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
index ffb5719c788f..228aef664c08 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
index 8f9423bd014e..9bc72b2df133 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
@@ -13,7 +13,6 @@ fn overwrite_inherit_optional_noop() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
index b3b1ccc5b117..6dd7fb6d65d0 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/in/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep/in/primary/Cargo.toml
index aaadbceb1638..2ac789d55543 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
index 400ab4e40a9a..b87a125ab8f7 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
@@ -13,7 +13,6 @@ fn overwrite_workspace_dep() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["zworkspace-inheritance"])
         .arg("add")
         .args(["foo", "--path", "./dependency", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep/out/primary/Cargo.toml
index d44f047917c7..da32f4ead802 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/in/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/in/primary/Cargo.toml
index 7ab3f9dd2c18..a131c946d9ab 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
index 0bbd6bfd22ed..de7d8e4444a4 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
@@ -13,7 +13,6 @@ fn overwrite_workspace_dep_features() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "--path", "./dependency", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
index c7301765f5a3..6f95ded6fc49 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/in/primary/Cargo.toml b/tests/testsuite/cargo_add/unknown_inherited_feature/in/primary/Cargo.toml
index 0f91d71a3c83..fb4a12619199 100644
--- a/tests/testsuite/cargo_add/unknown_inherited_feature/in/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/unknown_inherited_feature/in/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
index 14bae365ebe7..42713de86bde 100644
--- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
+++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
@@ -11,7 +11,6 @@ fn unknown_inherited_feature() {
     let cwd = &project_root;
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .arg("add")
         .args(["foo", "-p", "bar"])
         .current_dir(cwd)
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/out/primary/Cargo.toml b/tests/testsuite/cargo_add/unknown_inherited_feature/out/primary/Cargo.toml
index 0f91d71a3c83..fb4a12619199 100644
--- a/tests/testsuite/cargo_add/unknown_inherited_feature/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/unknown_inherited_feature/out/primary/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.0.0"
diff --git a/tests/testsuite/inheritable_workspace_fields.rs b/tests/testsuite/inheritable_workspace_fields.rs
index ac844f33ea7f..9f136453665a 100644
--- a/tests/testsuite/inheritable_workspace_fields.rs
+++ b/tests/testsuite/inheritable_workspace_fields.rs
@@ -71,8 +71,6 @@ fn deny_optional_dependencies() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [workspace]
             members = ["bar"]
 
@@ -104,7 +102,6 @@ Caused by:
   dep1 is optional, but workspace dependencies cannot be optional
 ",
         )
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .run();
 }
 
@@ -118,7 +115,6 @@ fn inherit_own_workspace_fields() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
             badges.workspace = true
 
             [package]
@@ -164,9 +160,7 @@ fn inherit_own_workspace_fields() {
         .file("bar.txt", "") // should be included when packaging
         .build();
 
-    p.cargo("publish --token sekrit")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("publish --token sekrit").run();
     publish::validate_upload_with_contents(
         r#"
         {
@@ -204,8 +198,6 @@ fn inherit_own_workspace_fields() {
             "Cargo.toml",
             &format!(
                 r#"{}
-cargo-features = ["workspace-inheritance"]
-
 [package]
 edition = "2018"
 rust-version = "1.60"
@@ -243,8 +235,6 @@ fn inherit_own_dependencies() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             name = "bar"
             version = "0.2.0"
@@ -276,7 +266,6 @@ fn inherit_own_dependencies() {
     Package::new("dep-dev", "0.5.2").publish();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -290,16 +279,12 @@ fn inherit_own_dependencies() {
         )
         .run();
 
-    p.cargo("check")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("check").run();
     let lockfile = p.read_lockfile();
     assert!(lockfile.contains("dep"));
     assert!(lockfile.contains("dep-dev"));
     assert!(lockfile.contains("dep-build"));
-    p.cargo("publish --token sekrit")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("publish --token sekrit").run();
     publish::validate_upload_with_contents(
         r#"
         {
@@ -359,8 +344,6 @@ fn inherit_own_dependencies() {
             "Cargo.toml",
             &format!(
                 r#"{}
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.2.0"
@@ -387,8 +370,6 @@ fn inherit_own_detailed_dependencies() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             name = "bar"
             version = "0.2.0"
@@ -412,7 +393,6 @@ fn inherit_own_detailed_dependencies() {
         .publish();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -425,14 +405,10 @@ fn inherit_own_detailed_dependencies() {
         )
         .run();
 
-    p.cargo("check")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("check").run();
     let lockfile = p.read_lockfile();
     assert!(lockfile.contains("dep"));
-    p.cargo("publish --token sekrit")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("publish --token sekrit").run();
     publish::validate_upload_with_contents(
         r#"
         {
@@ -472,8 +448,6 @@ fn inherit_own_detailed_dependencies() {
             "Cargo.toml",
             &format!(
                 r#"{}
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.2.0"
@@ -499,8 +473,6 @@ fn inherit_from_own_undefined_field() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [package]
             name = "foo"
             version = "1.2.5"
@@ -515,7 +487,6 @@ fn inherit_from_own_undefined_field() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_status(101)
         .with_stderr(
             "\
@@ -548,8 +519,6 @@ fn inherited_dependencies_union_features() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             name = "bar"
             version = "0.2.0"
@@ -567,7 +536,6 @@ fn inherited_dependencies_union_features() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -628,7 +596,6 @@ fn inherit_workspace_fields() {
             "bar/Cargo.toml",
             r#"
             badges.workspace = true
-            cargo-features = ["workspace-inheritance"]
             [package]
             name = "bar"
             workspace = ".."
@@ -657,10 +624,7 @@ fn inherit_workspace_fields() {
         .file("bar/bar.txt", "") // should be included when packaging
         .build();
 
-    p.cargo("publish --token sekrit")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .cwd("bar")
-        .run();
+    p.cargo("publish --token sekrit").cwd("bar").run();
     publish::validate_upload_with_contents(
         r#"
         {
@@ -700,8 +664,6 @@ fn inherit_workspace_fields() {
             "Cargo.toml",
             &format!(
                 r#"{}
-cargo-features = ["workspace-inheritance"]
-
 [package]
 edition = "2018"
 rust-version = "1.60"
@@ -754,8 +716,6 @@ fn inherit_dependencies() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             workspace = ".."
             name = "bar"
@@ -777,7 +737,6 @@ fn inherit_dependencies() {
     Package::new("dep-dev", "0.5.2").publish();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -791,17 +750,12 @@ fn inherit_dependencies() {
         )
         .run();
 
-    p.cargo("check")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .run();
+    p.cargo("check").run();
     let lockfile = p.read_lockfile();
     assert!(lockfile.contains("dep"));
     assert!(lockfile.contains("dep-dev"));
     assert!(lockfile.contains("dep-build"));
-    p.cargo("publish --token sekrit")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .cwd("bar")
-        .run();
+    p.cargo("publish --token sekrit").cwd("bar").run();
     publish::validate_upload_with_contents(
         r#"
         {
@@ -861,8 +815,6 @@ fn inherit_dependencies() {
             "Cargo.toml",
             &format!(
                 r#"{}
-cargo-features = ["workspace-inheritance"]
-
 [package]
 name = "bar"
 version = "0.2.0"
@@ -898,8 +850,6 @@ fn inherit_target_dependencies() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             workspace = ".."
             name = "bar"
@@ -917,7 +867,6 @@ fn inherit_target_dependencies() {
     Package::new("dep", "0.1.2").publish();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -951,8 +900,6 @@ fn inherit_dependency_override_optional() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             workspace = ".."
             name = "bar"
@@ -966,7 +913,6 @@ fn inherit_dependency_override_optional() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -992,8 +938,6 @@ fn inherit_dependency_features() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             name = "bar"
             version = "0.2.0"
@@ -1011,7 +955,6 @@ fn inherit_dependency_features() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [UPDATING] `[..]` index
@@ -1068,8 +1011,6 @@ fn inherit_detailed_dependencies() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             workspace = ".."
             name = "bar"
@@ -1085,7 +1026,6 @@ fn inherit_detailed_dependencies() {
     let git_root = git_project.root();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(&format!(
             "\
 [UPDATING] git repository `{}`\n\
@@ -1113,8 +1053,6 @@ fn inherit_path_dependencies() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [project]
             workspace = ".."
             name = "bar"
@@ -1130,7 +1068,6 @@ fn inherit_path_dependencies() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_stderr(
             "\
 [COMPILING] dep v0.9.0 ([CWD]/dep)
@@ -1174,7 +1111,6 @@ fn error_workspace_false() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .cwd("bar")
         .with_status(101)
         .with_stderr(
@@ -1198,7 +1134,6 @@ fn error_workspace_dependency_looked_for_workspace_itself() {
         .file(
             "Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
             [package]
             name = "bar"
             version = "1.2.3"
@@ -1219,7 +1154,6 @@ fn error_workspace_dependency_looked_for_workspace_itself() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .with_status(101)
         .with_stderr(
             "\
@@ -1251,8 +1185,6 @@ fn error_malformed_workspace_root() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [package]
             name = "bar"
             workspace = ".."
@@ -1264,7 +1196,6 @@ fn error_malformed_workspace_root() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .cwd("bar")
         .with_status(101)
         .with_stderr(
@@ -1296,8 +1227,6 @@ fn error_no_root_workspace() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [package]
             name = "bar"
             workspace = ".."
@@ -1311,7 +1240,6 @@ fn error_no_root_workspace() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .cwd("bar")
         .with_status(101)
         .with_stderr(
@@ -1344,8 +1272,6 @@ fn error_inherit_unspecified_dependency() {
         .file(
             "bar/Cargo.toml",
             r#"
-            cargo-features = ["workspace-inheritance"]
-
             [package]
             name = "bar"
             workspace = ".."
@@ -1359,7 +1285,6 @@ fn error_inherit_unspecified_dependency() {
         .build();
 
     p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
         .cwd("bar")
         .with_status(101)
         .with_stderr(
@@ -1375,89 +1300,3 @@ Caused by:
         )
         .run();
 }
-
-#[cargo_test]
-fn workspace_inheritance_not_enabled() {
-    registry::init();
-
-    let p = project().build();
-
-    let _ = git::repo(&paths::root().join("foo"))
-        .file(
-            "Cargo.toml",
-            r#"
-            [package]
-            name = "foo"
-            version = "1.2.5"
-            authors = ["rustaceans"]
-            description.workspace = true
-
-            [workspace]
-            members = []
-            "#,
-        )
-        .file("src/main.rs", "fn main() {}")
-        .build();
-
-    p.cargo("build")
-        .masquerade_as_nightly_cargo(&["workspace-inheritance"])
-        .with_status(101)
-        .with_stderr(
-            "\
-[ERROR] failed to parse manifest at `[CWD]/Cargo.toml`
-
-Caused by:
-  feature `workspace-inheritance` is required
-
-  The package requires the Cargo feature called `workspace-inheritance`, \
-  but that feature is not stabilized in this version of Cargo (1.[..]).
-  Consider adding `cargo-features = [\"workspace-inheritance\"]` to the top of Cargo.toml \
-  (above the [package] table) to tell Cargo you are opting in to use this unstable feature.
-  See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#workspace-inheritance \
-  for more information about the status of this feature.
-",
-        )
-        .run();
-}
-
-#[cargo_test]
-fn nightly_required() {
-    registry::init();
-
-    let p = project().build();
-
-    let _ = git::repo(&paths::root().join("foo"))
-        .file(
-            "Cargo.toml",
-            r#"
-            cargo-features = ["workspace-inheritance"]
-
-            [package]
-            name = "foo"
-            version = "1.2.5"
-            authors = ["rustaceans"]
-            description.workspace = true
-
-            [workspace]
-            members = []
-            "#,
-        )
-        .file("src/main.rs", "fn main() {}")
-        .build();
-
-    p.cargo("build")
-        .with_status(101)
-        .with_stderr(
-            "\
-[ERROR] failed to parse manifest at `[CWD]/Cargo.toml`
-
-Caused by:
-  the cargo feature `workspace-inheritance` requires a nightly version of Cargo, \
-  but this is the `stable` channel
-  See [..]
-  See https://doc.rust-lang.org/[..]cargo/reference/unstable.html#workspace-inheritance \
-  for more information about using this feature.
-",
-        )
-        .run();
-}