Skip to content

Remove trailing whitespace at the end of lines - #32235

Merged
bors merged 1 commit into
rust-lang:masterfrom
floftar:trailing_whitespace
Mar 28, 2016
Merged

Remove trailing whitespace at the end of lines#32235
bors merged 1 commit into
rust-lang:masterfrom
floftar:trailing_whitespace

Conversation

@floftar

@floftarfloftar commented Mar 13, 2016

Copy link
Copy Markdown
Contributor

According the rules of styling Rust code there should not be trailing whitespace at the end of lines or files. I thought that it might be good to remove trailing whitespace from other files also, if it does not break anything.

hanna-kruppe
hanna-kruppe reviewed Mar 13, 2016
View reviewed changes
Comment threadsrc/libbacktrace/Makefile.am Outdated

@hanna-kruppehanna-kruppeMar 13, 2016

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.

AFAIK libbracktrace is not part of Rust proper, so the Rust styleguide doesn't apply (and these files shouldn't be modified anyway if at all possible, because it complicates upgrades).

@steveklabniksteveklabnikMar 14, 2016

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.

Be careful with markdown files! I can't give this a proper review right now, but trailing white space is significant in them, it's used in the book intentionally at least once.

On Mar 13, 2016, 16:16 -0400, rkruppenotifications@github.com, wrote:

Insrc/libbacktrace/Makefile.am(#32235 (comment)):

@@ -6,12 +6,12 @@># met:>># (1) Redistributions of source code must retain the above copyright>-# notice, this list of conditions and the following disclaimer.

libbracktrace is not part of Rust proper, so the Rust styleguide doesn't apply (and these files shouldn't be modified anyway if at all possible, because it complicates upgrades).

—
Reply to this email directly orview it on GitHub(https://github.com/rust-lang/rust/pull/32235/files#r55942955).

@floftarfloftarMar 14, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for your comments! This change can be abandoned and be split for easier reviewing. Sorry about making a big change. Of course if trailing whitespaces are not a problem at all, then change does not have to be made in first place.

@steveklabniksteveklabnikMar 14, 2016

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.

I think that generally, removing it is good, but it can't be fully done with a script, eg, for reasons like both of these.

I agree with @rkruppe about everything in libbacktrace. I'll review the rest now.

@steveklabnik

steveklabnik commented Mar 14, 2016

Copy link
Copy Markdown
Contributor

Okay, yeah, all of this looks fine, except libbacktrace.

@floftar

floftar commented Mar 14, 2016

Copy link
Copy Markdown
ContributorAuthor

There should not be anymore changes to libbacktrace.

@steveklabnik

steveklabnik commented Mar 14, 2016

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

thanks so much!

@bors

bors commented Mar 14, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit dcadf29 has been approved by steveklabnik

@floftar

floftar commented Mar 14, 2016

Copy link
Copy Markdown
ContributorAuthor

Thanks for comments. I will try to make smaller commits in the future to make reviews easier.

@bors

bors commented Mar 15, 2016

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #30652) made this pull request unmergeable. Please resolve the merge conflicts.

@bors

bors commented Mar 22, 2016

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #32402) made this pull request unmergeable. Please resolve the merge conflicts.

@floftar

floftar commented Mar 23, 2016

Copy link
Copy Markdown
ContributorAuthor

I rebased this pull request.

@sanxiyn

sanxiyn commented Mar 28, 2016

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 28, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit ccafdae has been approved by sanxiyn

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Mar 28, 2016
@steveklabnik
Rollup merge ofrust-lang#32235- fbergr:trailing_whitespace, r=sanxiyn
56bb7b6
Remove trailing whitespace at the end of lines
According the rules of styling Rust code there should not be trailing whitespace at the end of lines or files. I thought that it might be good to remove trailing whitespace from other files also, if it does not break anything.
@steveklabniksteveklabnik mentioned this pull request Mar 28, 2016
Merged
bors added a commit that referenced this pull request Mar 28, 2016
@bors
Auto merge of#32561- steveklabnik:rollup, r=steveklabnik
221c940
Rollup of 7 pull requests
- Successful merges: #32177, #32235, #32472, #32504, #32507, #32509, #32534
- Failed merges:
@bors
bors merged commit ccafdae into rust-lang:masterMar 28, 2016
@floftar
floftar deleted the trailing_whitespace branch March 29, 2016 03:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@steveklabniksteveklabnik

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@floftar@steveklabnik@bors@sanxiyn@hanna-kruppe