Skip to content

Clean newlines #28864

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 2 commits into from
Oct 6, 2015
Merged

Clean newlines #28864

merged 2 commits into from
Oct 6, 2015

Conversation

constancebello
Copy link
Contributor

Remove leading newlines in files and replace lines containing only whitespace with blank lines

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (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.

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 6, 2015

📌 Commit 3967e1c has been approved by steveklabnik

@steveklabnik
Copy link
Member

Thank you!

@bors
Copy link
Collaborator

bors commented Oct 6, 2015

⌛ Testing commit 3967e1c with merge 0d59012...

Sorry I didn’t get this in the last PR (#28864), I hadn’t thought of it.
@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 6, 2015

📌 Commit aba267f has been approved by steveklabnik

@bors
Copy link
Collaborator

bors commented Oct 6, 2015

⌛ Testing commit aba267f with merge 80660d6...

bors added a commit that referenced this pull request Oct 6, 2015
Remove leading newlines in files and replace lines containing only whitespace with blank lines
@@ -1,7 +1,7 @@
// ignore-tidy-cr ignore-license
// ignore-tidy-cr (repeated again because of tidy bug)
// license is ignored because tidy can't handle the CRLF here properly.

Copy link
Member

Choose a reason for hiding this comment

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

No! Not this file! This test is specifically supposed to use crlf! This is changing the blank lines from \r\n to \n!

Copy link
Member

Choose a reason for hiding this comment

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

Ahhhhh eff. @Aarzee can you send a PR fixing this?

@bors bors merged commit aba267f into rust-lang:master Oct 6, 2015
@steveklabnik
Copy link
Member

If @Aarzee can't do this soon, I will fix it tomorrow. Of course I missed one 👎

@constancebello
Copy link
Contributor Author

Sorry, didn't realize this was wrong. I don't think I'll be able to fix this tonight/tomorrow as I've got a couple obligations involving limited Internet access. :(

On Oct 6, 2015, at 9:05 PM, Steve Klabnik [email protected] wrote:

If @Aarzee can't do this soon, I will fix it tomorrow. Of course I missed one


Reply to this email directly or view it on GitHub.

@steveklabnik
Copy link
Member

No worries! I'll do it right now then.

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 7, 2015
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But
@retp998 noticed[1] that this file is explicitly a test of this kind of
whitespace, and so I shouldn't have changed it. This restores the old
line endings.

1: rust-lang#28864 (comment)
@steveklabnik
Copy link
Member

Sent: #28876

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 7, 2015
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But
@retp998 noticed[1] that this file is explicitly a test of this kind of
whitespace, and so I shouldn't have changed it. This restores the old
line endings.

1: rust-lang#28864 (comment)
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 7, 2015
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But
@retp998 noticed[1] that this file is explicitly a test of this kind of
whitespace, and so I shouldn't have changed it. This restores the old
line endings.

1: rust-lang#28864 (comment)
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.

6 participants