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.

Sign up for GitHub

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

Jump to bottom

refactor StyledBuffer #84235

Merged
merged 7 commits into from
Apr 26, 2021
Merged

refactor StyledBuffer #84235

merged 7 commits into from
Apr 26, 2021

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Apr 16, 2021

Refactors StyledBuffer text and styles fields content into StyledChar and touches some other stuff.

@rust-highfive
Copy link
Collaborator

r? @lcnr

(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 Apr 16, 2021
@klensy
Copy link
Contributor Author

klensy commented Apr 16, 2021

I expected that change in prepend will alter output, as in some cases it will not generate additional spaces, but actually nothing changed! Looks like somewhere deep in emitter additional spaces was cleaned before.

@klensy klensy marked this pull request as ready for review April 16, 2021 05:01
lcnr
lcnr approved these changes Apr 16, 2021
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

some small nits, feel free to implement the ones you consider an improvement, afterwards r=me

compiler/rustc_errors/src/styled_buffer.rs Outdated Show resolved Hide resolved
compiler/rustc_errors/src/styled_buffer.rs Outdated Show resolved Hide resolved
compiler/rustc_errors/src/styled_buffer.rs Outdated Show resolved Hide resolved
compiler/rustc_errors/src/styled_buffer.rs Outdated Show resolved Hide resolved
@klensy
Copy link
Contributor Author

klensy commented Apr 18, 2021

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Apr 18, 2021

@klensy: 🔑 Insufficient privileges: Not in reviewers

lcnr
lcnr requested changes Apr 18, 2021
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

a final small stylistic nit, sorry '^^

@bors delegate+

compiler/rustc_errors/src/styled_buffer.rs Outdated Show resolved Hide resolved
@klensy
Copy link
Contributor Author

klensy commented Apr 24, 2021

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Apr 24, 2021

@klensy: 🔑 Insufficient privileges: Not in reviewers

@lcnr
Copy link
Contributor

lcnr commented Apr 25, 2021

@bors r+ rollup

forgot that bors commands don't work in review comments 😅

@bors
Copy link
Contributor

bors commented Apr 25, 2021

📌 Commit 8ebd811 has been approved by lcnr

@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 Apr 25, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 25, 2021
@Dylan-DPC
Rollup merge of rust-lang#84235 - klensy:styled-buffer, r=lcnr
343dc0d 
refactor StyledBuffer

Refactors StyledBuffer `text` and `styles` fields content into StyledChar and touches some other stuff.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 25, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 25, 2021
@Dylan-DPC
Rollup merge of rust-lang#84235 - klensy:styled-buffer, r=lcnr
75e1331 
refactor StyledBuffer

Refactors StyledBuffer `text` and `styles` fields content into StyledChar and touches some other stuff.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 25, 2021
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 25, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2021
@bors
Auto merge of rust-lang#84564 - Dylan-DPC:rollup-wxa2yr0, r=Dylan-DPC
f8f5968 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#84235 (refactor StyledBuffer)
 - rust-lang#84450 (Give a better error when `std` or `core` are missing)
 - rust-lang#84486 (Handle pretty printing of `else if let` clauses without ICEing)
 - rust-lang#84499 (Tweak trait not `use`d suggestion)
 - rust-lang#84516 (Add suggestion to "use break" when attempting to implicit-break a loop)
 - rust-lang#84520 (Improve diagnostics for function passed when a type was expected.)
 - rust-lang#84541 (Inline most raw socket, fd and handle conversions)
 - rust-lang#84547 (Get rid of is_min_const_fn)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e7e22b4 into rust-lang:master Apr 26, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr requested changes

Assignees

@lcnr lcnr

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.53.0
Development

Successfully merging this pull request may close these issues.
5 participants
@klensy @rust-highfive @bors @lcnr @rustbot