Skip to content

Run cargo fmt#471

Merged
bors-servo merged 1 commit into
rust-lang:masterfrom
fitzgen:refmt
Feb 3, 2017
Merged

Run cargo fmt#471
bors-servo merged 1 commit into
rust-lang:masterfrom
fitzgen:refmt

Conversation

@fitzgen

@fitzgen fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member

It's been a while, and we have a lot of reformatting with the latest version of rustfmt.

@highfive

highfive commented Feb 3, 2017

Copy link
Copy Markdown

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@fitzgen

fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member Author

@bors-servo r=me

@fitzgen

fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member Author

@bors-servo r+

@bors-servo

Copy link
Copy Markdown

📌 Commit 58b3ed1 has been approved by fitzgen

@emilio emilio left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me, though I'm afraid this will cause a lot of unneeded pain in #468, maybe we should cherry-pick only the changes that don't touch codegen for now?

EDIT: whoops, didn't see the self-review

Comment thread src/codegen/mod.rs
// Try to catch a bitfield contination early.
if let (Some(ref mut bitfield_width), Some(width)) =
(current_bitfield_width, field.bitfield()) {
(current_bitfield_width, field.bitfield()) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

not a fan of this one :(

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I often wouldn't make the specific choices rustfmt makes, but that's not really the point ;) The point is not having to make the choices, and argue about them with each other.

@fitzgen

fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member Author

I'm afraid this will cause a lot of unneeded pain in #468

Woops :(

I just wanted to get this stuff out from cluttering up my own feature branch :-/

@fitzgen

fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member Author

Maybe we should revisit the decision not to fail CI on unformatted code?

@emilio

emilio commented Feb 3, 2017

Copy link
Copy Markdown
Contributor

You mean to fail CI on unformatted code? Yeah, that's probably fine, and avoids these noisy diffs.

@fitzgen

fitzgen commented Feb 3, 2017

Copy link
Copy Markdown
Member Author

You mean to fail CI on unformatted code? Yeah, that's probably fine, and avoids these noisy diffs.

Ok, will send a new PR for this soon.

@bors-servo

Copy link
Copy Markdown

⌛ Testing commit 58b3ed1 with merge f4b1309...

bors-servo pushed a commit that referenced this pull request Feb 3, 2017
Run `cargo fmt`

It's been a while, and we have a lot of reformatting with the latest version of `rustfmt`.
@bors-servo

Copy link
Copy Markdown

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing f4b1309 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants