Skip to content

Commit abed12a

Browse files
committed
Add src/tools/x to the main workspace
The original reason to exclude it was so it could run before submodules were initialized. However, those have all been converted to subtrees now, so the entire workspace is always ready to go.
1 parent 93257e2 commit abed12a

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

Cargo.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6438,6 +6438,10 @@ version = "0.5.5"
64386438
source = "registry+https://github.com/rust-lang/crates.io-index"
64396439
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
64406440

6441+
[[package]]
6442+
name = "x"
6443+
version = "0.1.1"
6444+
64416445
[[package]]
64426446
name = "xattr"
64436447
version = "1.4.0"

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ members = [
4545
"src/tools/coverage-dump",
4646
"src/tools/wasm-component-ld",
4747
"src/tools/features-status-dump",
48+
"src/tools/x",
4849
]
4950

5051
exclude = [
@@ -55,11 +56,6 @@ exclude = [
5556
"tests/rustdoc-gui",
5657
# HACK(eddyb) This hardcodes the fact that our CI uses `/checkout/obj`.
5758
"obj",
58-
# The `x` binary is a thin wrapper that calls `x.py`, which initializes
59-
# submodules, before which workspace members cannot be invoked because
60-
# not all `Cargo.toml` files are available, so we exclude the `x` binary,
61-
# so it can be invoked before the current checkout is set up.
62-
"src/tools/x",
6359
]
6460

6561
[profile.release.package.rustc-rayon-core]

src/tools/tidy/src/deps.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>,
8181
("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None, &[]),
8282
("src/tools/rustbook", EXCEPTIONS_RUSTBOOK, None, &["src/doc/book", "src/doc/reference"]),
8383
("src/tools/rustc-perf", EXCEPTIONS_RUSTC_PERF, None, &["src/tools/rustc-perf"]),
84-
("src/tools/x", &[], None, &[]),
8584
// tidy-alphabetical-end
8685
];
8786

src/tools/x/Cargo.lock

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)