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

rustfmt liblibc #29045

Merged
merged 1 commit into from
Oct 22, 2015
Merged

rustfmt liblibc #29045

merged 1 commit into from
Oct 22, 2015

Conversation

mseri
Copy link
Contributor

@mseri mseri commented Oct 14, 2015

r? @nrc

Nothing special going on, the only real notable change is the explicit ABI on line 6183.
I re-onlined some extern on top of the file by hand.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

Some of the empty function bodies should remain on one line. I filed https://github.com/nrc/rustfmt/issues/463. I don't think it needs fixing up.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

Could you remove the #[rustfmt_skip]s from the fixup please? I think we will fix rustfmt soon and then they won't be necessary.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

https://github.com/nrc/rustfmt/issues/465

From line 2962, I guess you could fix that up or leave it till we fix rustfmt.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

At line 5907 - https://github.com/nrc/rustfmt/issues/466 - this does need a fixup, I think.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

There's a few instances of that, actually.

@nrc
Copy link
Member

nrc commented Oct 14, 2015

There's a lot of those, probably not worth trying to fixup manually, we should block on fixing https://github.com/nrc/rustfmt/issues/466

@mseri
Copy link
Contributor Author

mseri commented Oct 14, 2015

I thought that the functions alignments where meant to be like that after seeing few of them. I'll fix those and the misaligned SYNCHRONIZED and push the update soon.

@mseri
Copy link
Contributor Author

mseri commented Oct 14, 2015

Ok. Then I won't touch it anymore and will wait for the fix. I will try to help but I don't know rust and rustfmt internals enough (yet)

@nrc
Copy link
Member

nrc commented Oct 15, 2015

@mseri if you'd like to try and fix the rustfmt bug, it shouldn't be too hard (although not the easiest), I'm happy to mentor over on the rustfmt repo. You don't need to know anything about rust's internals.

@mseri
Copy link
Contributor Author

mseri commented Oct 15, 2015

Thanks, I will look into it as soon as I get some free time.

@mseri
Copy link
Contributor Author

mseri commented Oct 17, 2015

Is it possible to track down why rustfmt failed to reformat the long lines in commit d368102 ?

@nrc
Copy link
Member

nrc commented Oct 18, 2015

@mseri it's because they are in an extern block. I think that is fixed now.

@mseri
Copy link
Contributor Author

mseri commented Oct 19, 2015

@nrc it is fixed indeed, with rustfmt commit d326a29. However the following one introduced a serious bug (issue nrc/rustfmt#499)

@mseri
Copy link
Contributor Author

mseri commented Oct 19, 2015

It looks like now rustfmt is doing a pretty great job here.

@nrc
Copy link
Member

nrc commented Oct 20, 2015

@mseri could you squash your commits please? It will give better history, but also I can't easily review this on GitHub.

@mseri
Copy link
Contributor Author

mseri commented Oct 21, 2015

@nrc history cleaned

@nrc
Copy link
Member

nrc commented Oct 21, 2015

@mseri thanks for sticking with this one, looks good now.

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 21, 2015

📌 Commit 34a547f has been approved by nrc

Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 21, 2015
r? @nrc

Nothing special going on, the only real notable change is the explicit ABI on line 6183. 
I re-onlined some extern on top of the file by hand.
@bors
Copy link
Contributor

bors commented Oct 22, 2015

⌛ Testing commit 34a547f with merge 7bb0ac5...

bors added a commit that referenced this pull request Oct 22, 2015
r? @nrc

Nothing special going on, the only real notable change is the explicit ABI on line 6183. 
I re-onlined some extern on top of the file by hand.
@bors bors merged commit 34a547f into rust-lang:master Oct 22, 2015
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