Include formatting check in the test step for tidy.
This commit is contained in:
parent
5f17b63dac
commit
2b081abe94
|
@ -779,6 +779,9 @@ impl Step for Tidy {
|
||||||
/// This tool in `src/tools` checks up on various bits and pieces of style and
|
/// This tool in `src/tools` checks up on various bits and pieces of style and
|
||||||
/// otherwise just implements a few lint-like checks that are specific to the
|
/// otherwise just implements a few lint-like checks that are specific to the
|
||||||
/// compiler itself.
|
/// compiler itself.
|
||||||
|
///
|
||||||
|
/// Once tidy passes, this step also runs `fmt --check` if tests are being run
|
||||||
|
/// for the `dev` or `nightly` channels.
|
||||||
fn run(self, builder: &Builder<'_>) {
|
fn run(self, builder: &Builder<'_>) {
|
||||||
let mut cmd = builder.tool_cmd(Tool::Tidy);
|
let mut cmd = builder.tool_cmd(Tool::Tidy);
|
||||||
cmd.arg(builder.src.join("src"));
|
cmd.arg(builder.src.join("src"));
|
||||||
|
@ -792,6 +795,11 @@ impl Step for Tidy {
|
||||||
|
|
||||||
builder.info("tidy check");
|
builder.info("tidy check");
|
||||||
try_run(builder, &mut cmd);
|
try_run(builder, &mut cmd);
|
||||||
|
|
||||||
|
if builder.config.channel == "dev" || builder.config.channel == "nightly" {
|
||||||
|
builder.info("fmt check");
|
||||||
|
crate::format::format(&builder.build, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
||||||
|
|
Loading…
Reference in New Issue