Skip to content

Fix that ./x test --no-doc actually keeps the same behaviour for backwards compatability #153725

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.

Sign up for GitHub

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

Merged
rust-bors merged 1 commit into from
Mar 12, 2026
+14 −9
Merged

Fix that ./x test --no-doc actually keeps the same behaviour for backwards compatability #153725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/bootstrap/src/core/config/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,16 +570,21 @@ impl Subcommand {

pub fn test_target(&self) -> TestTarget {
match *self {
Subcommand::Test { all_targets, doc, tests, .. }
| Subcommand::Miri { all_targets, doc, tests, .. } => match (all_targets, doc, tests) {
(true, true, _) | (true, _, true) | (_, true, true) => {
panic!("You can only set one of `--all-targets`, `--doc` and `--tests`.")
Subcommand::Test { mut all_targets, doc, tests, no_doc, .. }
| Subcommand::Miri { mut all_targets, doc, tests, no_doc, .. } => {
// for backwards compatibility --no-doc keeps working
all_targets = all_targets || no_doc;

match (all_targets, doc, tests) {
(true, true, _) | (true, _, true) | (_, true, true) => {
panic!("You can only set one of `--all-targets`, `--doc` and `--tests`.")
}
(true, false, false) => TestTarget::AllTargets,
(false, true, false) => TestTarget::DocOnly,
(false, false, true) => TestTarget::Tests,
(false, false, false) => TestTarget::Default,
}
(true, false, false) => TestTarget::AllTargets,
(false, true, false) => TestTarget::DocOnly,
(false, false, true) => TestTarget::Tests,
(false, false, false) => TestTarget::Default,
},
}
_ => TestTarget::Default,
}
}
Expand Down
Loading