From ecf14ebdbecc6bdefe421aaccb6fa596d8924230 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 31 Dec 2025 08:18:58 -0800
Subject: [PATCH] Remove cargo workspace inheritance

This removes the inheritance added in
39239d00780c476d9fe84db833b442b7b6695f3f. Due to the way `mdbook-spec`
is integrated into `rust-lang/rust`, `cargo vendor` does not work. This
doesn't work because we are trying to meld multiple workspaces, and
`cargo vendor` doesn't normalize/remove the workspace inheritance.
---
 Cargo.toml                   | 11 -----------
 tools/diagnostics/Cargo.toml |  4 ++--
 tools/grammar/Cargo.toml     | 12 ++++++------
 tools/mdbook-spec/Cargo.toml | 12 ++++++------
 tools/style-check/Cargo.toml |  4 ++--
 tools/xtask/Cargo.toml       |  4 ++--
 6 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f70a441645..6525dffec1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,14 +6,3 @@ exclude = [
     "linkchecker"
 ]
 resolver = "2"
-
-[workspace.package]
-edition = "2024"
-license = "MIT OR Apache-2.0"
-
-[workspace.dependencies]
-diagnostics = { path = "tools/diagnostics" }
-grammar = { path = "tools/grammar" }
-pathdiff =  "0.2.3"
-regex = "1.12.2"
-walkdir = "2.5.0"
diff --git a/tools/diagnostics/Cargo.toml b/tools/diagnostics/Cargo.toml
index a11d30cabb..8652629ac4 100644
--- a/tools/diagnostics/Cargo.toml
+++ b/tools/diagnostics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "diagnostics"
-edition.workspace = true
-license.workspace = true
+edition = "2024"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
diff --git a/tools/grammar/Cargo.toml b/tools/grammar/Cargo.toml
index 59213b6263..87d93f5c13 100644
--- a/tools/grammar/Cargo.toml
+++ b/tools/grammar/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "grammar"
-edition.workspace = true
-license.workspace = true
+edition = "2024"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
-diagnostics.workspace = true
-pathdiff.workspace = true
-regex.workspace = true
-walkdir.workspace = true
+diagnostics = { path = "../diagnostics" }
+pathdiff =  "0.2.3"
+regex = "1.12.2"
+walkdir = "2.5.0"
diff --git a/tools/mdbook-spec/Cargo.toml b/tools/mdbook-spec/Cargo.toml
index ef29c6382a..c71bd782a2 100644
--- a/tools/mdbook-spec/Cargo.toml
+++ b/tools/mdbook-spec/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mdbook-spec"
-edition.workspace = true
-license.workspace = true
+edition = "2024"
+license = "MIT OR Apache-2.0"
 description = "An mdBook preprocessor to help with the Rust specification."
 repository = "https://github.com/rust-lang/spec/"
 default-run = "mdbook-spec"
@@ -10,15 +10,15 @@ default-run = "mdbook-spec"
 
 [dependencies]
 anyhow = "1.0.79"
-diagnostics.workspace = true
-grammar.workspace = true
+diagnostics = { path = "../diagnostics" }
+grammar = { path = "../grammar" }
 mdbook-markdown = "0.5.1"
 mdbook-preprocessor = "0.5.1"
 once_cell = "1.19.0"
 pathdiff = "0.2.1"
 railroad = { version = "0.3.2", default-features = false }
-regex.workspace = true
+regex = "1.12.2"
 semver = "1.0.21"
 serde_json = "1.0.113"
 tempfile = "3.10.1"
-walkdir.workspace = true
+walkdir = "2.5.0"
diff --git a/tools/style-check/Cargo.toml b/tools/style-check/Cargo.toml
index 29328b14b5..d34d23947f 100644
--- a/tools/style-check/Cargo.toml
+++ b/tools/style-check/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "style-check"
-edition.workspace = true
-license.workspace = true
+edition = "2024"
+license = "MIT OR Apache-2.0"
 authors = ["steveklabnik <steve@steveklabnik.com>"]
 
 [dependencies]
diff --git a/tools/xtask/Cargo.toml b/tools/xtask/Cargo.toml
index 4286197a4d..ec0a3633e0 100644
--- a/tools/xtask/Cargo.toml
+++ b/tools/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-edition.workspace = true
-license.workspace = true
+edition = "2024"
+license = "MIT OR Apache-2.0"
 
 [dependencies]