Add Unicode block-drawing compiler output support #126597
Open
+2,361
−314
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
T-compiler
estebank
force-pushed
the
unicode-output
branch
2 times, most recently
from
0fb5d30
to
3b7a44f
Compare
estebank
changed the title
This comment was marked as resolved.
This comment was marked as resolved.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment was marked as resolved.
This comment was marked as resolved.
|
Some changes occurred in tests/ui/check-cfg cc @Urgau |
|
r? compiler |
estebank
commented
Jun 20, 2024
This comment has been minimized.
This comment has been minimized.
Urgau
reviewed
Jun 21, 2024
This comment has been minimized.
This comment has been minimized.
estebank
added
the
S-waiting-on-review
estebank
commented
Jun 21, 2024
This comment was marked as resolved.
This comment was marked as resolved.
estebank
force-pushed
the
unicode-output
branch
2 times, most recently
from
57ff435
to
6fe519d
Compare
rustbot
removed
the
I-compiler-nominated
estebank
force-pushed
the
unicode-output
branch
from
c64e042
to
171688f
Compare
estebank
removed
the
S-waiting-on-team
|
☔ The latest upstream changes (presumably #130778) made this pull request unmergeable. Please resolve the merge conflicts. |
estebank
force-pushed
the
unicode-output
branch
from
171688f
to
f8f56b6
Compare
This comment was marked as resolved.
This comment was marked as resolved.
fmease
approved these changes
Oct 10, 2024
| if margin.was_cut_left() { | ||
| // We have stripped some code/whitespace from the beginning, make it clear. | ||
| buffer.puts(line_offset, code_offset, "...", Style::LineNumber); | ||
| buffer.puts(line_offset, code_offset, placeholder, Style::LineNumber); | ||
| } | ||
| if margin.was_cut_right(line_len) { |
There was a problem hiding this comment.
Not super important: You could slightly tweak the comment & code inside Margin::was_cut_right? The comment is outdated (refers to "code above" and "...") and hard-codes the offset (it's 6 right now; it that 2 * width(padding)?).
I think was_cut_right is still correct because "...".len() == 3 == "…".len() but otoh I'm not sure if it the usizes represent byte offsets for indexing or for displaying ("len vs width"). So might be worth double checking.
There was a problem hiding this comment.
Note that below, you use placeholder.chars().map(|ch| char_width(ch)).sum() to robustly calculate the padding of the placeholder.
There was a problem hiding this comment.
… however given the plan to push annotate-snippets forward and eventually use it in the compiler over emitter.rs, I'm sure if these issues matter ^^'.
| if margin.was_cut_left() { | ||
| // We have stripped some code/whitespace from the beginning, make it clear. | ||
| buffer.puts(line_offset, code_offset, "...", Style::LineNumber); | ||
| buffer.puts(line_offset, code_offset, placeholder, Style::LineNumber); |
There was a problem hiding this comment.
I haven't spent too much thought on this but I wonder if things would break (offsets, alignments) if OutputTheme::Ascii.margin().len() != OutputTheme::Unicode.margin().len() (which coincidentally isn't the case for ... and … so things just work out). Anyway, see comment chain directly below.
| @@ -1102,7 +1155,11 @@ impl HumanEmitter { | |||
| let style = | |||
| if annotation.is_primary { Style::LabelPrimary } else { Style::LabelSecondary }; | |||
| let (pos, col) = if pos == 0 { | |||
| (pos + 1, (annotation.end_col.display + 1).saturating_sub(left)) | |||
| if annotation.end_col.display == 0 { | |||
There was a problem hiding this comment.
Could you maybe leave a comment why this is necessary?
| @@ -2082,7 +2249,7 @@ impl HumanEmitter { | |||
| buffer.putc( | |||
| row_num, | |||
| (padding as isize + p) as usize, | |||
| if part.is_addition(sm) { '+' } else { '~' }, | |||
| if part.is_addition(sm) { '+' } else { self.diff() }, | |||
There was a problem hiding this comment.
Side note: For annotate-snippet, it would be nice if symbols like + that currently don't vary by OutputTheme get moved to the "palette".
fmease
added
S-waiting-on-author
fmease
force-pushed
the
unicode-output
branch
from
f8f56b6
to
2af9d09
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Add nightly-only theming support to rustc output using Unicode box drawing characters instead of ASCII-art to draw the terminal UI: After: ``` error: foo ╭▸ test.rs:3:3 │ 3 │ X0 Y0 Z0 │ ┌───╿──│──┘ │ ┌│───│──┘ │ ┏││━━━┙ │ ┃││ 4 │ ┃││ X1 Y1 Z1 5 │ ┃││ X2 Y2 Z2 │ ┃│└────╿──│──┘ `Z` label │ ┃└─────│──┤ │ ┗━━━━━━┥ `Y` is a good letter too │ `X` is a good letter ╰╴ note: bar ╭▸ test.rs:4:3 │ 4 │ ┏ X1 Y1 Z1 5 │ ┃ X2 Y2 Z2 6 │ ┃ X3 Y3 Z3 │ ┗━━━━━━━━━━┛ ├ note: bar ╰ note: baz note: qux ╭▸ test.rs:4:3 │ 4 │ X1 Y1 Z1 ╰╴ ━━━━━━━━ ``` Before: ``` error: foo --> test.rs:3:3 | 3 | X0 Y0 Z0 | ___^__-__- | |___|__| | ||___| | ||| 4 | ||| X1 Y1 Z1 5 | ||| X2 Y2 Z2 | |||____^__-__- `Z` label | ||_____|__| | |______| `Y` is a good letter too | `X` is a good letter | note: bar --> test.rs:4:3 | 4 | / X1 Y1 Z1 5 | | X2 Y2 Z2 6 | | X3 Y3 Z3 | |__________^ = note: bar = note: baz note: qux --> test.rs:4:3 | 4 | X1 Y1 Z1 | ^^^^^^^^ ```
fmease
force-pushed
the
unicode-output
branch
from
2af9d09
to
eb55252
Compare
fmease
added
rla-silenced
fmease
force-pushed
the
unicode-output
branch
from
d9c8f15
to
b53c0cb
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 10, 2024
Add Unicode block-drawing compiler output support Add nightly-only theming support to rustc output using Unicode box drawing characters instead of ASCII-art to draw the terminal UI. In order to enable, the flags `-Zunstable-options=yes --error-format=human-unicode` must be passed in. After: ``` error: foo ╭▸ test.rs:3:3 │ 3 │ X0 Y0 Z0 │ ┌───╿──│──┘ │ ┌│───│──┘ │ ┏││━━━┙ │ ┃││ 4 │ ┃││ X1 Y1 Z1 5 │ ┃││ X2 Y2 Z2 │ ┃│└────╿──│──┘ `Z` label │ ┃└─────│──┤ │ ┗━━━━━━┥ `Y` is a good letter too │ `X` is a good letter ╰╴ note: bar ╭▸ test.rs:4:3 │ 4 │ ┏ X1 Y1 Z1 5 │ ┃ X2 Y2 Z2 6 │ ┃ X3 Y3 Z3 │ ┗━━━━━━━━━━┛ ├ note: bar ╰ note: baz note: qux ╭▸ test.rs:4:3 │ 4 │ X1 Y1 Z1 ╰╴ ━━━━━━━━ ``` Before: ``` error: foo --> test.rs:3:3 | 3 | X0 Y0 Z0 | ___^__-__- | |___|__| | ||___| | ||| 4 | ||| X1 Y1 Z1 5 | ||| X2 Y2 Z2 | |||____^__-__- `Z` label | ||_____|__| | |______| `Y` is a good letter too | `X` is a good letter | note: bar --> test.rs:4:3 | 4 | / X1 Y1 Z1 5 | | X2 Y2 Z2 6 | | X3 Y3 Z3 | |__________^ = note: bar = note: baz note: qux --> test.rs:4:3 | 4 | X1 Y1 Z1 | ^^^^^^^^ ``` After:  Before: 
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add nightly-only theming support to rustc output using Unicode box
drawing characters instead of ASCII-art to draw the terminal UI.
In order to enable, the flags
-Zunstable-options=yes --error-format=human-unicodemust be passed in.After:
Before:
After:
Before:
