Skip to content

Tidy: fix running rustfmt twice - #70106

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:fix-tidy-fmt-twice
Mar 19, 2020
Merged

Tidy: fix running rustfmt twice#70106
bors merged 1 commit into
rust-lang:masterfrom
ehuss:fix-tidy-fmt-twice

Conversation

@ehuss

Copy link
Copy Markdown
Contributor

./x.py test tidy runs rustfmt twice. This is because Build::build runs execute_cli twice (once dry, once not). This can be quite slow (and prints a bunch of things twice).

I'm not sure if this is really the best place to check the dry_run status.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 18, 2020
@Mark-Simulacrum

Copy link
Copy Markdown
Member

Huh, I'm surprised we didn't notice before. Thanks!

The location for checking dry_run seems fine.

@bors r+

@bors

bors commented Mar 18, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 287c4eb has been approved by Mark-Simulacrum

@borsbors 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 Mar 18, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 18, 2020
…mulacrum
Tidy: fix running rustfmt twice
`./x.py test tidy` runs rustfmt twice. This is because `Build::build` runs `execute_cli` twice (once dry, once not). This can be quite slow (and prints a bunch of things twice).
I'm not sure if this is really the best place to check the dry_run status.
@CentrilCentril mentioned this pull request Mar 18, 2020
@CentrilCentril mentioned this pull request Mar 18, 2020
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Mar 18, 2020
Rollup of 10 pull requests
Successful merges:
- rust-lang#67749 (keyword docs for else and inkeyword docs for else and in.)
- rust-lang#69139 (clean up E0308 explanation)
- rust-lang#69189 (Erase regions in writeback)
- rust-lang#69837 (Use smaller discriminants for generators)
- rust-lang#69838 (Expansion-driven outline module parsing)
- rust-lang#69839 (Miri error reform)
- rust-lang#69899 (Make methods declared by `newtype_index` macro `const`)
- rust-lang#69920 (Remove some imports to the rustc crate)
- rust-lang#70075 (Fix repr pretty display)
- rust-lang#70106 (Tidy: fix running rustfmt twice)
Failed merges:
- rust-lang#70051 (Allow `hir().find` to return `None`)
- rust-lang#70074 (Expand: nix all fatal errors)
r? @ghost
@bors
bors merged commit b6f61a1 into rust-lang:masterMar 19, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@ehuss@Mark-Simulacrum@bors@rust-highfive