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

Revert Replace ASCII control chars with Unicode Control Pictures #128179

Closed
wants to merge 1 commit into from

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 25, 2024

reverts #127528 as that was a perf regression

r? @estebank

…rs, r=oli-obk"

This reverts commit cce2db0, reversing
changes made to cfc5f25.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 25, 2024

@bors rollup=never

@compiler-errors
Copy link
Member

@bors r+

I'd like to see this code re-landed in a way that's more efficient, since the improvement to diagnostics is quite nice. This is worth probably a spin-off discussion about how diagnostics formatting code affects the good path in the case of lints and warnings.

@bors
Copy link
Contributor

bors commented Jul 25, 2024

📌 Commit 6679c62 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Jul 25, 2024
@estebank
Copy link
Contributor

estebank commented Jul 25, 2024

I'm honestly a bit shocked that it had a perf regression (as it only affected rendering...)

Edit: I'm assuming it is some second order effect on early_lint_checks?

@compiler-errors
Copy link
Member

See the discussion at #128169 (comment) for more info, if you haven't already

@estebank
Copy link
Contributor

@compiler-errors thanks, catching up

@estebank
Copy link
Contributor

estebank commented Jul 25, 2024

I suspect that the culprit is https://github.com/rust-lang/rust/pull/128200/files#diff-a35029c589a6b5b002ecf598efb24d174232e719ecbc6f741a58eee8509cd6a5L2612-L2614

It wasn't noticeable before because the list was short enough, but big-O likely dominates now over constant times.

@compiler-errors
Copy link
Member

@bors r-

Let's give this a tiny bit of time to let Esteban fix the perf w/o a full revert.

@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 Jul 25, 2024
@bors
Copy link
Contributor

bors commented Jul 29, 2024

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

@lqd
Copy link
Member

lqd commented Jul 31, 2024

Closing in favor of #128200 which gains much of the performance back and should land soon.

@lqd lqd closed this Jul 31, 2024
@oli-obk oli-obk deleted the revert452 branch July 31, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants