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.

Sign up for GitHub

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

Jump to bottom

Run cargo fmt #471

Merged
merged 1 commit into from
Feb 3, 2017
Merged

Run cargo fmt #471

merged 1 commit into from
Feb 3, 2017

Conversation

fitzgen
Copy link
Member

@fitzgen fitzgen commented Feb 3, 2017

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

@highfive
Copy link

highfive commented Feb 3, 2017

warning Warning warning

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

@fitzgen
Copy link
Member Author

fitzgen commented Feb 3, 2017

@bors-servo r=me

@fitzgen
Copy link
Member Author

fitzgen commented Feb 3, 2017

@bors-servo r+

@bors-servo
Copy link

📌 Commit 58b3ed1 has been approved by fitzgen

emilio
emilio reviewed Feb 3, 2017
View reviewed changes
Copy link
Contributor

@emilio emilio left a comment •
edited
Loading

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

src/codegen/mod.rs
@@ -1012,10 +1020,12 @@ impl CodeGenerator for CompInfo {

// 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
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
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
Copy link
Member Author

fitzgen commented Feb 3, 2017

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
Copy link
Member Author

fitzgen commented Feb 3, 2017

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

@emilio
Copy link
Contributor

emilio commented Feb 3, 2017

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

@fitzgen
Copy link
Member Author

fitzgen commented Feb 3, 2017

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

⌛ Testing commit 58b3ed1 with merge f4b1309...

bors-servo pushed a commit that referenced this pull request Feb 3, 2017
Auto merge of #471 - fitzgen:refmt, r=fitzgen
f4b1309 
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

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

@bors-servo bors-servo merged commit 58b3ed1 into rust-lang:master Feb 3, 2017
This was referenced Feb 3, 2017
Closed
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio emilio left review comments

Assignees

@fitzgen fitzgen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fitzgen @highfive @bors-servo @emilio