Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 757913d

Browse files
committedAug 21, 2022
bootstrap: Don't allow rustfmt to fail on dist.
When running `x.py dist`, rustfmt was being allowed to fail when missing-tools is true. This isn't much of an issue in practice since other CI jobs will fail if rustfmt fails. This code was just leftovers from when rustfmt was tracked in toolstate, and this removes it to make it clear that it no longer works that way.
1 parent 45e2fc3 commit 757913d

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed
 

‎src/bootstrap/dist.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,17 +1226,10 @@ impl Step for Rustfmt {
12261226

12271227
let rustfmt = builder
12281228
.ensure(tool::Rustfmt { compiler, target, extra_features: Vec::new() })
1229-
.or_else(|| {
1230-
missing_tool("Rustfmt", builder.build.config.missing_tools);
1231-
None
1232-
})?;
1229+
.expect("rustfmt expected to build - essential tool");
12331230
let cargofmt = builder
12341231
.ensure(tool::Cargofmt { compiler, target, extra_features: Vec::new() })
1235-
.or_else(|| {
1236-
missing_tool("Cargofmt", builder.build.config.missing_tools);
1237-
None
1238-
})?;
1239-
1232+
.expect("cargo fmt expected to build - essential tool");
12401233
let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);
12411234
tarball.set_overlay(OverlayKind::Rustfmt);
12421235
tarball.is_preview(true);

0 commit comments

Comments
 (0)
Please sign in to comment.