Skip to content

tests: remove some trailing ws #124398

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Apr 30, 2024
Merged

tests: remove some trailing ws #124398

merged 2 commits into from
Apr 30, 2024

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Apr 26, 2024

Cleans one more case of trailing whitespace in tests.

@rustbot
Copy link
Collaborator

rustbot commented Apr 26, 2024

r? @TaKO8Ki

rustbot has assigned @TaKO8Ki.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 26, 2024
@rust-log-analyzer

This comment has been minimized.

# to view
@rust-log-analyzer

This comment has been minimized.

# to view
@klensy
Copy link
Contributor Author

klensy commented Apr 26, 2024

@rustbot author

Blessing clippy & rustfmt

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 26, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 26, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@klensy
Copy link
Contributor Author

klensy commented Apr 26, 2024

@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 Apr 26, 2024
compiler-errors
compiler-errors reviewed Apr 26, 2024
View reviewed changes
compiler/rustc_errors/src/emitter.rs
}
_ => {
buffer.puts(*row_num, max_line_num_len + 1, "~ ", Style::Addition);
}
}
buffer.append(*row_num, &normalize_whitespace(line_to_add), Style::NoStyle);
buffer.puts(
Copy link
Member

Choose a reason for hiding this comment

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

What's the difference here (specifically, why do we need + 3)? Would be worth adding comments explaining a lot of the logic for the + Ns in this function.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added explanation for that changed part.

@compiler-errors
Copy link
Member

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 26, 2024
@klensy
Copy link
Contributor Author

klensy commented Apr 27, 2024

@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 Apr 27, 2024
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 29, 2024

📌 Commit ce48c60 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 29, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2024
@bors
Auto merge of rust-lang#124398 - klensy:trailing-ws, r=compiler-errors
37e6b82 
tests: remove some trailing ws

Cleans one more case of trailing whitespace in tests.
@bors
Copy link
Collaborator

bors commented Apr 30, 2024

⌛ Testing commit ce48c60 with merge 74a8df6...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented Apr 30, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 74a8df6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2024
@bors bors merged commit 74a8df6 into rust-lang:master Apr 30, 2024
11 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Apr 30, 2024
@bors bors mentioned this pull request Apr 30, 2024
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (74a8df6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.8% [-1.8%, -1.8%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -1.8% [-1.8%, -1.8%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.8% [0.8%, 0.8%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.242s -> 674.628s (0.35%)
Artifact size: 315.98 MiB -> 315.93 MiB (-0.01%)

flip1995 pushed a commit to flip1995/rust that referenced this pull request May 2, 2024
@bors
Auto merge of rust-lang#124398 - klensy:trailing-ws, r=compiler-errors
4bee978 
tests: remove some trailing ws

Cleans one more case of trailing whitespace in tests.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
7 participants
@klensy @rustbot @rust-log-analyzer @compiler-errors @bors @rust-timer @TaKO8Ki