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

Change multiline span ASCII art visual order #104795

Merged
merged 3 commits into from
Nov 28, 2022

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Nov 23, 2022

Tweak the ASCII art for nested multiline spans so that we minimize line overlaps.

Partially addresses #61017.

@rustbot
Copy link
Collaborator

rustbot commented Nov 23, 2022

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@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 Nov 23, 2022
Comment on lines 998 to +1013
3 | X0 Y0 Z0
| ______^
4 | | 1
5 | | 2
6 | | 3
7 | | X1 Y1 Z1
| |_________-
| _______^
4 | | 1
5 | | 2
6 | | 3
7 | | X1 Y1 Z1
| | _________-
8 | || 4
9 | || 5
10 | || 6
11 | || X2 Y2 Z2
| ||__________- `Z` is a good letter too
... |
15 | | 10
16 | | X3 Y3 Z3
| |_______^ `Y` is a good letter
... |
15 | | 10
16 | | X3 Y3 Z3
| |________^ `Y` is a good letter
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the main case I wanted to address.

@TaKO8Ki
Copy link
Member

TaKO8Ki commented Nov 27, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 27, 2022

📌 Commit d84cff7 has been approved by TaKO8Ki

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 Nov 27, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 27, 2022
Change multiline span ASCII art visual order

Tweak the ASCII art for nested multiline spans so that we minimize line overlaps.

Partially addresses rust-lang#61017.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 27, 2022
Change multiline span ASCII art visual order

Tweak the ASCII art for nested multiline spans so that we minimize line overlaps.

Partially addresses rust-lang#61017.
@matthiaskrgr
Copy link
Member

@bors r- clippy tests need to be blessed
#104972 (comment)

@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 Nov 27, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 28, 2022

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@estebank
Copy link
Contributor Author

@bors r=TaKO8Ki

@bors
Copy link
Contributor

bors commented Nov 28, 2022

📌 Commit 136ffa2 has been approved by TaKO8Ki

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 28, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#104360 (Stabilize native library modifier `verbatim`)
 - rust-lang#104732 (Refactor `ty::ClosureKind` related stuff)
 - rust-lang#104795 (Change multiline span ASCII art visual order)
 - rust-lang#104890 (small method code cleanup)
 - rust-lang#104907 (Remove `SelectionContext::infcx()` in favor of field access)
 - rust-lang#104927 (Simplify some binder shifting logic)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 79fe15c into rust-lang:master Nov 28, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 28, 2022
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants