Skip to content

Commit ecf14eb

Browse files
committed
Remove cargo workspace inheritance
This removes the inheritance added in 39239d0. 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.
1 parent 607b77d commit ecf14eb

File tree

6 files changed

+18
-29
lines changed

6 files changed

+18
-29
lines changed

Cargo.toml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,3 @@ exclude = [
66
"linkchecker"
77
]
88
resolver = "2"
9-
10-
[workspace.package]
11-
edition = "2024"
12-
license = "MIT OR Apache-2.0"
13-
14-
[workspace.dependencies]
15-
diagnostics = { path = "tools/diagnostics" }
16-
grammar = { path = "tools/grammar" }
17-
pathdiff = "0.2.3"
18-
regex = "1.12.2"
19-
walkdir = "2.5.0"

tools/diagnostics/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "diagnostics"
3-
edition.workspace = true
4-
license.workspace = true
3+
edition = "2024"
4+
license = "MIT OR Apache-2.0"
55

66
[dependencies]

tools/grammar/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
22
name = "grammar"
3-
edition.workspace = true
4-
license.workspace = true
3+
edition = "2024"
4+
license = "MIT OR Apache-2.0"
55

66
[dependencies]
7-
diagnostics.workspace = true
8-
pathdiff.workspace = true
9-
regex.workspace = true
10-
walkdir.workspace = true
7+
diagnostics = { path = "../diagnostics" }
8+
pathdiff = "0.2.3"
9+
regex = "1.12.2"
10+
walkdir = "2.5.0"

tools/mdbook-spec/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "mdbook-spec"
3-
edition.workspace = true
4-
license.workspace = true
3+
edition = "2024"
4+
license = "MIT OR Apache-2.0"
55
description = "An mdBook preprocessor to help with the Rust specification."
66
repository = "https://github.com/rust-lang/spec/"
77
default-run = "mdbook-spec"
@@ -10,15 +10,15 @@ default-run = "mdbook-spec"
1010

1111
[dependencies]
1212
anyhow = "1.0.79"
13-
diagnostics.workspace = true
14-
grammar.workspace = true
13+
diagnostics = { path = "../diagnostics" }
14+
grammar = { path = "../grammar" }
1515
mdbook-markdown = "0.5.1"
1616
mdbook-preprocessor = "0.5.1"
1717
once_cell = "1.19.0"
1818
pathdiff = "0.2.1"
1919
railroad = { version = "0.3.2", default-features = false }
20-
regex.workspace = true
20+
regex = "1.12.2"
2121
semver = "1.0.21"
2222
serde_json = "1.0.113"
2323
tempfile = "3.10.1"
24-
walkdir.workspace = true
24+
walkdir = "2.5.0"

tools/style-check/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "style-check"
3-
edition.workspace = true
4-
license.workspace = true
3+
edition = "2024"
4+
license = "MIT OR Apache-2.0"
55
authors = ["steveklabnik <[email protected]>"]
66

77
[dependencies]

tools/xtask/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xtask"
3-
edition.workspace = true
4-
license.workspace = true
3+
edition = "2024"
4+
license = "MIT OR Apache-2.0"
55

66
[dependencies]

0 commit comments

Comments
 (0)