Skip to content
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.

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

(Mostly) finish formatting the repository #67596

Merged
merged 3 commits into from
Dec 25, 2019

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Dec 24, 2019

Silences tidy line length warnings on rustfmt-controlled files.

This leaves two things out of formatting: CloudABI (mostly because it's not really ours to control, it's upstream code that's mostly generated), and tests. The latter is a hard problem and maybe not one to worry too much about, we rarely edit old tests and reformatting them as we go if possible isn't too bad (they're generally small).

rustfmt tries its best already, we should not fight with it.
Use #[rustfmt::skip] on the tidy-parsed macro invocations
@Mark-Simulacrum Mark-Simulacrum changed the title Finish formatting the repository (Mostly) finish formatting the repository Dec 24, 2019
@Centril
Copy link
Contributor

Centril commented Dec 24, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Contributor

bors commented Dec 24, 2019

📌 Commit 8d6d0e7 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 24, 2019
@bors
Copy link
Contributor

bors commented Dec 25, 2019

⌛ Testing commit 8d6d0e7 with merge c5a2a9a...

bors added a commit that referenced this pull request Dec 25, 2019
(Mostly) finish formatting the repository

Silences tidy line length warnings on rustfmt-controlled files.

This leaves two things out of formatting: CloudABI (mostly because it's not really ours to control, it's upstream code that's mostly generated), and tests. The latter is a hard problem and maybe not one to worry too much about, we rarely edit old tests and reformatting them as we go if possible isn't too bad (they're generally small).
@bors
Copy link
Contributor

bors commented Dec 25, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing c5a2a9a to master...

Comment on lines +395 to +401
// An extern type at offset 0, we fall back to its static alignment.
// FIXME: Once we have made decisions for how to handle size and alignment
// of `extern type`, this should be adapted. It is just a temporary hack
// to get some code to work that probably ought to work.
{
field_layout.align.abi
}
Copy link
Member

@RalfJung RalfJung Jan 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks pretty odd, in particular with the comment... any chance we could set match_arm_blocks = false to avoid this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we're trying to stay as close to defaults as possible, but I would personally not be opposed to such.

@Mark-Simulacrum Mark-Simulacrum deleted the tidy-silence-rustfmt branch January 3, 2020 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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