Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: Disallow --exclude test::std #112297

Merged
merged 2 commits into from
Jun 10, 2023
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 5, 2023

Use the top-level Kind to determine whether Steps are excluded.

Previously, this would use the Kind passed to --exclude (and not do any filtering at all if no kind was passed).
That meant that x test linkchecker --exclude std would fail - you had to explicitly say --exclude test::std.

Change bootstrap to use the top-level Kind instead, which does the right thing automatically.
Note that this breaks things like x test --exclude doc::std, but I'm not sure why you'd ever want to do that.

There's a lot of churn here, but the 1-line change in the first commit is the actual behavior change, the rest is just cleanup.

Fixes #103201. Note that this effectively reverts most of #91965.

cc @pietroalbini

Previously, this would use the `Kind` passed to `--exclude` (and not do any filtering at all if no kind was passed).
That meant that `x test linkchecker --exclude std` would fail - you had to explicitly say `--exclude test::std`.

Change bootstrap to use the top-level Kind instead, which does the right thing automatically.
Note that this breaks things like `x test --exclude doc::std`, but I'm not sure why you'd ever want to do that.
@jyn514 jyn514 marked this pull request as ready for review June 5, 2023 02:47
@rustbot
Copy link
Collaborator

rustbot commented Jun 5, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 5, 2023
@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 10, 2023

📌 Commit c73c5dd has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 10, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 10, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#112297 (bootstrap: Disallow `--exclude test::std`)
 - rust-lang#112298 (Update field-offset and enable unstable_offset_of)
 - rust-lang#112335 (ci: Upgrade loongarch64-linux-gnu GCC to 13.1.0)
 - rust-lang#112413 (Adjust span labels for `HIDDEN_GLOB_REEXPORTS`)
 - rust-lang#112483 (Add deprecation warning to python versions <3.6 in x.py)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 04e41dd into rust-lang:master Jun 10, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Simplify --exclude syntax and make it more useful
5 participants