about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJack Huey <31162821+jackh726@users.noreply.github.com>2021-04-28 22:59:27 -0400
committerGitHub <noreply@github.com>2021-04-28 22:59:27 -0400
commite6dce233a36c388d99dfcf9e71d7397183744b5a (patch)
tree75215c38b58a1ae90ebf559265ebf067432fc3ee
parent87b2aced4a82c9c81e38a51a91210ae6d8382997 (diff)
parentb28754ab7d2a3440362d208bfd8c3f39511a7eeb (diff)
downloadrust-e6dce233a36c388d99dfcf9e71d7397183744b5a.tar.gz
rust-e6dce233a36c388d99dfcf9e71d7397183744b5a.zip
Rollup merge of #84585 - jyn514:check-rustdoc, r=Mark-Simulacrum
Add `x.py check src/librustdoc` as an alias for `x.py check src/tools/rustdoc`

I keep making this typo, it would be nice for it to be supported.
-rw-r--r--src/bootstrap/check.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 38dda5b744e..9b76c8b9a2d 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -280,7 +280,7 @@ impl Step for CodegenBackend {
 }
 
 macro_rules! tool_check_step {
-    ($name:ident, $path:expr, $source_type:expr) => {
+    ($name:ident, $path:literal, $($alias:literal, )* $source_type:path) => {
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub struct $name {
             pub target: TargetSelection,
@@ -292,7 +292,7 @@ macro_rules! tool_check_step {
             const DEFAULT: bool = true;
 
             fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-                run.path($path)
+                run.paths(&[ $path, $($alias),* ])
             }
 
             fn make_run(run: RunConfig<'_>) {
@@ -361,7 +361,7 @@ macro_rules! tool_check_step {
     };
 }
 
-tool_check_step!(Rustdoc, "src/tools/rustdoc", SourceType::InTree);
+tool_check_step!(Rustdoc, "src/tools/rustdoc", "src/librustdoc", SourceType::InTree);
 // Clippy is a hybrid. It is an external tool, but uses a git subtree instead
 // of a submodule. Since the SourceType only drives the deny-warnings
 // behavior, treat it as in-tree so that any new warnings in clippy will be