Skip to content

run rustfmt on std::path #29200

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

Merged
merged 1 commit into from
Nov 4, 2015
Merged

run rustfmt on std::path #29200

merged 1 commit into from
Nov 4, 2015

Conversation

tshepang
Copy link
Member

No description provided.

@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

VerbatimUNC(x,y) => 8 + os_str_len(x) +
if os_str_len(y) > 0 { 1 + os_str_len(y) }
else { 0 },
VerbatimUNC(x, y) => 8 + os_str_len(x) +
Copy link
Contributor

Choose a reason for hiding this comment

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

Ughh, rustfmt doesn't do inline if-else expressions well. I'd personally refactor this to use an intermediate value.

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 changed that into a block instead... it's more readable, and gets formatted better by rustfmt.

There was a bunch of manual fixes too... rustfmt isn't quite there yet
@aturon
Copy link
Member

aturon commented Nov 4, 2015

@tshepang Sorry, I've been away on paternity leave for the past couple of weeks. This looks great to me.

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 4, 2015

📌 Commit 37735b4 has been approved by aturon

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Nov 4, 2015
bors added a commit that referenced this pull request Nov 4, 2015
@bors
Copy link
Collaborator

bors commented Nov 4, 2015

⌛ Testing commit 37735b4 with merge 1be3f9f...

@bors bors merged commit 37735b4 into rust-lang:master Nov 4, 2015
@tshepang
Copy link
Member Author

tshepang commented Nov 4, 2015

no problem, thanks

@tshepang tshepang deleted the rustfmt-path branch November 4, 2015 14:49
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.

5 participants