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-ing liblog v2. #28991

Merged
merged 3 commits into from
Oct 14, 2015
Merged

Conversation

goyox86
Copy link
Contributor

@goyox86 goyox86 commented Oct 12, 2015

Hi Rustaceans!

This is the second version of running rustfmt on liblog #28898. There are only rustfmt suggested changes. Because I think that some patterns here (that I fixed up in the prev PR need to be discussed in detail.

//cc @nrc

@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 @nikomatsakis (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.

@goyox86 goyox86 changed the title rustfmt suggested changes. Rustfmt-ing liblog v2. Oct 12, 2015
@goyox86 goyox86 mentioned this pull request Oct 12, 2015
LogDirective { name: Some("crate1::mod1".to_string()), level: 0 }
];
let dirs = [LogDirective {
name: None,
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems wrong, it should be indented relative to beginning of LogDirective (above and below too).

@nrc
Copy link
Member

nrc commented Oct 13, 2015

I'd like to see if https://github.com/nrc/rustfmt/pull/449 fixes the odd formatting in the tests. The only other thing is the comment which needs fixing up, otherwise looks good!

@goyox86 goyox86 force-pushed the goyox86/rustfmting-liblog-II branch from c015a35 to 5943af3 Compare October 13, 2015 09:44
@goyox86
Copy link
Contributor Author

goyox86 commented Oct 13, 2015

@nrc, @alexcrichton I've run latest rustfmt and semmed to fix the issues. Also manually aligned comments.

@nikomatsakis
Copy link
Contributor

I'm inclined to r+, but I'll wait on what @alexcrichton thinks.

@nikomatsakis
Copy link
Contributor

r? @alexcrichton

@nrc
Copy link
Member

nrc commented Oct 13, 2015

LGTM

@goyox86 thanks for the changes!

@goyox86
Copy link
Contributor Author

goyox86 commented Oct 13, 2015

Sweet! @nrc The CI bot will merge it. Or do I have to merge?

@alexcrichton
Copy link
Member

@bors: r+ 94946db

Ah no worries @goyox86, now that @bors has the r+ it'll come along eventually and auto-merge

@bors
Copy link
Contributor

bors commented Oct 13, 2015

📌 Commit 94946db has been approved by alexcrichton

Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 14, 2015
…I, r=alexcrichton

Hi Rustaceans!

This is the second version of running rustfmt on liblog rust-lang#28898. There are only rustfmt suggested changes. Because I think that some patterns here (that I fixed up in the prev PR need to be discussed in detail.

//cc @nrc
bors added a commit that referenced this pull request Oct 14, 2015
@bors bors merged commit 94946db into rust-lang:master Oct 14, 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.

7 participants