From 66deb691d6347c5d9128ac5961e0d8ca73f1d370 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 7 Mar 2025 10:31:14 -0800 Subject: [PATCH] Alphabetize the root workspace members --- Cargo.toml | 60 ++++++++++++++++++++------------------ src/tools/tidy/src/main.rs | 2 ++ 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21f0e84c4f6..16ff0f61593 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,51 +1,53 @@ [workspace] resolver = "2" members = [ +# tidy-alphabetical-start "compiler/rustc", "src/build_helper", "src/etc/test-float-parse", - "src/rustc-std-workspace/rustc-std-workspace-core", "src/rustc-std-workspace/rustc-std-workspace-alloc", + "src/rustc-std-workspace/rustc-std-workspace-core", "src/rustc-std-workspace/rustc-std-workspace-std", "src/rustdoc-json-types", + "src/tools/build-manifest", + "src/tools/bump-stage0", "src/tools/cargotest", "src/tools/clippy", "src/tools/clippy/clippy_dev", + "src/tools/collect-license-metadata", "src/tools/compiletest", - "src/tools/run-make-support", - "src/tools/linkchecker", - "src/tools/lint-docs", - "src/tools/miropt-test-tools", - "src/tools/unstable-book-gen", - "src/tools/tidy", - "src/tools/tier-check", - "src/tools/build-manifest", - "src/tools/remote-test-client", - "src/tools/remote-test-server", - "src/tools/rust-installer", - "src/tools/rustdoc", - "src/tools/rustfmt", - "src/tools/miri", - "src/tools/miri/cargo-miri", - "src/tools/rustdoc-themes", - "src/tools/unicode-table-generator", + "src/tools/coverage-dump", + "src/tools/features-status-dump", + "src/tools/generate-copyright", + "src/tools/generate-windows-sys", + "src/tools/html-checker", "src/tools/jsondocck", "src/tools/jsondoclint", - "src/tools/llvm-bitcode-linker", - "src/tools/html-checker", - "src/tools/bump-stage0", - "src/tools/replace-version-placeholder", + "src/tools/linkchecker", + "src/tools/lint-docs", "src/tools/lld-wrapper", - "src/tools/collect-license-metadata", - "src/tools/generate-copyright", - "src/tools/suggest-tests", - "src/tools/generate-windows-sys", - "src/tools/rustdoc-gui-test", + "src/tools/llvm-bitcode-linker", + "src/tools/miri", + "src/tools/miri/cargo-miri", + "src/tools/miropt-test-tools", "src/tools/opt-dist", - "src/tools/coverage-dump", + "src/tools/remote-test-client", + "src/tools/remote-test-server", + "src/tools/replace-version-placeholder", + "src/tools/run-make-support", + "src/tools/rust-installer", + "src/tools/rustdoc", + "src/tools/rustdoc-gui-test", + "src/tools/rustdoc-themes", + "src/tools/rustfmt", + "src/tools/suggest-tests", + "src/tools/tidy", + "src/tools/tier-check", + "src/tools/unicode-table-generator", + "src/tools/unstable-book-gen", "src/tools/wasm-component-ld", - "src/tools/features-status-dump", "src/tools/x", +# tidy-alphabetical-end ] exclude = [ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index bc3519142dd..4078d462f55 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -29,6 +29,7 @@ fn main() { FromStr::from_str(&env::args().nth(4).expect("need concurrency")) .expect("concurrency must be a number"); + let root_manifest = root_path.join("Cargo.toml"); let src_path = root_path.join("src"); let tests_path = root_path.join("tests"); let library_path = root_path.join("library"); @@ -137,6 +138,7 @@ fn main() { check!(edition, &compiler_path); check!(edition, &library_path); + check!(alphabetical, &root_manifest); check!(alphabetical, &src_path); check!(alphabetical, &tests_path); check!(alphabetical, &compiler_path);