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

Remove unnecessary trailing whitespace from error messages #86197

Merged
merged 1 commit into from
Aug 4, 2021

Conversation

FabianWolff
Copy link
Contributor

Some error messages currently contain unnecessary trailing whitespace. There are some legitimate reasons for having trailing whitespace in the output, such as for uniform indentation of possibly-empty input lines, but the whitespace I have addressed here occurs in a line used only for spacing, and I see no reason why that should have trailing whitespace (spacing lines inserted in other places also don't have trailing whitespace).

I have also removed a superfluous call to buffer.putc(), which has no effect because the same character is already placed there by draw_col_separator().

Use git diff --ignore-space-at-eol to see my changes; otherwise the diff is quite large due to the whitespace removed from expected outputs in src/test/ui/.

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 10, 2021
@bors
Copy link
Contributor

bors commented Jun 17, 2021

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

@FabianWolff FabianWolff force-pushed the trailing-whitespace branch from b8e0a1a to 2228740 Compare June 24, 2021 14:21
@bors
Copy link
Contributor

bors commented Jul 9, 2021

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

@FabianWolff FabianWolff force-pushed the trailing-whitespace branch from 2228740 to 9bc1c4d Compare July 10, 2021 13:03
@bors
Copy link
Contributor

bors commented Jul 11, 2021

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

@camelid
Copy link
Member

camelid commented Jul 29, 2021

r? @JohnTitor

@FabianWolff: could you fix the merge conflicts? Once you've fixed them, you should be able to mark your PR as ready for review with @rustbot ready. Thanks!

@rustbot author

@rustbot

This comment has been minimized.

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 29, 2021
@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 29, 2021
@FabianWolff FabianWolff force-pushed the trailing-whitespace branch from 9bc1c4d to df0dfd4 Compare July 31, 2021 12:39
@FabianWolff
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 31, 2021
@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2021

@JohnTitor

@bors
Copy link
Contributor

bors commented Aug 2, 2021

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

@FabianWolff FabianWolff force-pushed the trailing-whitespace branch from df0dfd4 to ee300b6 Compare August 2, 2021 19:28
Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@JohnTitor
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 3, 2021

📌 Commit ee300b6 has been approved by JohnTitor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 3, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 3, 2021
…JohnTitor

Remove unnecessary trailing whitespace from error messages

Some error messages currently contain unnecessary trailing whitespace. There are some legitimate reasons for having trailing whitespace in the output, such as for uniform indentation of possibly-empty input lines, but the whitespace I have addressed here occurs in a line used only for spacing, and I see no reason why that should have trailing whitespace (spacing lines inserted in other places also don't have trailing whitespace).

I have also removed a superfluous call to `buffer.putc()`, which has no effect because the same character is already placed there by `draw_col_separator()`.

Use `git diff --ignore-space-at-eol` to see my changes; otherwise the diff is quite large due to the whitespace removed from expected outputs in `src/test/ui/`.
@JohnTitor
Copy link
Member

Failed in rollup: #87741 (comment)
@bors r- rollup=iffy

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 3, 2021
@JohnTitor JohnTitor closed this Aug 3, 2021
@JohnTitor JohnTitor reopened this Aug 3, 2021
@rust-log-analyzer

This comment has been minimized.

@FabianWolff FabianWolff force-pushed the trailing-whitespace branch from ee300b6 to f8372f8 Compare August 4, 2021 08:48
@FabianWolff
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 4, 2021
@rustbot
Copy link
Collaborator

rustbot commented Aug 4, 2021

@JohnTitor

@JohnTitor
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 4, 2021

📌 Commit f8372f8 has been approved by JohnTitor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 4, 2021
@bors
Copy link
Contributor

bors commented Aug 4, 2021

⌛ Testing commit f8372f8 with merge 87d713f...

@bors
Copy link
Contributor

bors commented Aug 4, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 87d713f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 4, 2021
@bors bors merged commit 87d713f into rust-lang:master Aug 4, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants