Skip to content

Commit e4b57e1

Browse files
committed
Allow checking miri and RLS with x.py check src/tools/{miri,rls}
1 parent e5f83d2 commit e4b57e1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/bootstrap/builder.rs

+2
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,8 @@ impl<'a> Builder<'a> {
377377
check::Rustdoc,
378378
check::CodegenBackend,
379379
check::Clippy,
380+
check::Miri,
381+
check::Rls,
380382
check::Bootstrap
381383
),
382384
Kind::Test => describe!(

src/bootstrap/check.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ macro_rules! tool_check_step {
289289
impl Step for $name {
290290
type Output = ();
291291
const ONLY_HOSTS: bool = true;
292-
const DEFAULT: bool = true $( && $default )?;
292+
// don't ever check out-of-tree tools by default, they'll fail when toolstate is broken
293+
const DEFAULT: bool = matches!($source_type, SourceType::InTree) $( && $default )?;
293294

294295
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
295296
run.paths(&[ $path, $($alias),* ])
@@ -367,6 +368,8 @@ tool_check_step!(Rustdoc, "src/tools/rustdoc", "src/librustdoc", SourceType::InT
367368
// behavior, treat it as in-tree so that any new warnings in clippy will be
368369
// rejected.
369370
tool_check_step!(Clippy, "src/tools/clippy", SourceType::InTree);
371+
tool_check_step!(Miri, "src/tools/miri", SourceType::Submodule);
372+
tool_check_step!(Rls, "src/tools/rls", SourceType::Submodule);
370373

371374
tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree, false);
372375

0 commit comments

Comments
 (0)