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

Refactor EmitterWriter::emit_suggestion_default #91250

Merged
merged 1 commit into from
Nov 30, 2021

Conversation

rukai
Copy link
Contributor

@rukai rukai commented Nov 26, 2021

Makes progress towards #89979

Split into 2 commits:

  • the first commit is purely a refactor and I verified that ./x.py test src/test/ui --stage 1 and ./x.py test src/test/rustdoc-ui --stage 1 continue to pass on this commit.
  • the second commit removes the empty trailing line from diff style suggestions. - I discovered an issue with this so its just the refactor now.

r? diagnostics

@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(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 Nov 26, 2021
@rukai
Copy link
Contributor Author

rukai commented Nov 26, 2021

I just noticed a regression in src/test/ui/suggestions/suggest-change-mut.stderr due to the logic change.
I'll remove the last commit, so it is left with just the refactor.
I would like to land the PR like this and investigate how to remove the trailing line in a follow up PR.

@rukai rukai force-pushed the remove_trailing_whitespace branch from 8325a61 to a5c7215 Compare November 26, 2021 13:58
@rukai rukai changed the title Remove empty trailing line from suggestion Refactor EmitterWriter::emit_suggestion_default Nov 26, 2021
@rust-log-analyzer

This comment has been minimized.

@rukai rukai force-pushed the remove_trailing_whitespace branch from a5c7215 to df3e7a2 Compare November 26, 2021 14:13
@wesleywiser
Copy link
Member

Thanks @rukai!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 29, 2021

📌 Commit df3e7a2 has been approved by wesleywiser

@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 Nov 29, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 30, 2021
…=wesleywiser

Refactor EmitterWriter::emit_suggestion_default

Makes progress towards rust-lang#89979

Split into 2 commits:
* the first commit is purely a refactor and I verified that `./x.py test src/test/ui --stage 1` and  `./x.py test src/test/rustdoc-ui --stage 1` continue to pass on this commit.
* ~~the second commit removes the empty trailing line from diff style suggestions.~~ - I discovered an issue with this so its just the refactor now.

r? diagnostics
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 30, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#91243 (Don't treat unnormalized function arguments as well-formed)
 - rust-lang#91250 (Refactor EmitterWriter::emit_suggestion_default )
 - rust-lang#91317 (tests: Ignore `test/debuginfo/rc_arc.rs` on windows-gnu)
 - rust-lang#91323 (CTFE: support assert_zero_valid and assert_uninit_valid)
 - rust-lang#91358 (Fix small typo)
 - rust-lang#91360 (:arrow_up: rust-analyzer)
 - rust-lang#91368 (Don't re-export `MirPass`)
 - rust-lang#91383 (Add `drop_while` as doc alias to `Iterator::skip_while`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 626afa1 into rust-lang:master Nov 30, 2021
@rustbot rustbot added this to the 1.59.0 milestone Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants