Add x.py check src/librustdoc as an alias for x.py check src/tools/rustdoc
#84585
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jyn514
added
T-bootstrap
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
src/bootstrap/check.rs
Outdated
| @@ -292,7 +292,7 @@ macro_rules! tool_check_step { | |||
| const DEFAULT: bool = true; | |||
|
|
|||
| fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { | |||
| run.path($path) | |||
| run.path($path) $(.path($alias))* | |||
There was a problem hiding this comment.
This is not quite right -- we likely want to use paths(&[...]) here, which sets up a set of paths all describing the same thing, rather than different things on the same Step. We're not always consistent about that but it's the intended API usage.
This is basically intended to support the use case of test library/core library/std not testing alloc; these checks don't really support it anyway, but I'd prefer to use the right API. If it's a pain to make the macro play nice with that then no worries.
There was a problem hiding this comment.
Sure thing, done. It was pretty simple:
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 786cca14863..536843d4ec2 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -292,7 +292,7 @@ impl Step for $name {
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path($path) $(.path($alias))*
+ run.paths(&[ $path, $($alias),* ])
}
fn make_run(run: RunConfig<'_>) {
|
r=me with nit fixed if it's not too hard, otherwise just r=me |
Mark-Simulacrum
added
S-waiting-on-author
|
@bors r=Mark-Simulacrum rollup |
|
📌 Commit b28754a has been approved by |
bors
added
S-waiting-on-bors
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Apr 28, 2021
…crum 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.
jackh726
added a commit
to jackh726/rust
that referenced
this pull request
Apr 28, 2021
…crum 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.
jackh726
added a commit
to jackh726/rust
that referenced
this pull request
Apr 29, 2021
…crum 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.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 29, 2021
Rollup of 11 pull requests Successful merges: - rust-lang#84484 (Don't rebuild rustdoc and clippy after checking bootstrap) - rust-lang#84530 (`test tidy` should ignore alternative `build` dir patterns) - rust-lang#84531 (Ignore commented out lines when finding features) - rust-lang#84540 (Build sanitizers for x86_64-unknown-linux-musl) - rust-lang#84555 (Set `backtrace-on-ice` by default for compiler and codegen profiles) - rust-lang#84585 (Add `x.py check src/librustdoc` as an alias for `x.py check src/tools/rustdoc`) - rust-lang#84636 (rustdoc: change aliases attribute to data-aliases) - rust-lang#84646 (Add some regression tests related to rust-lang#82494) - rust-lang#84661 (Remove extra word in `rustc_mir` docs) - rust-lang#84663 (Remove `DropGuard` in `sys::windows::process` and use `StaticMutex` instead) - rust-lang#84668 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I keep making this typo, it would be nice for it to be supported.