Auto merge of rust-lang#126597 - estebank:unicode-output, r=fmease

bors · bors · commit e2962cc0797b · 2024-11-11T00:00:58.000Z
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: ![rustc output with unicode box drawing characters](https://github.com/rust-lang/rust/assets/1606434/d210b79a-6579-4407-9706-ba8edc6e9f25) Before: ![current rustc output with ASCII art](https://github.com/rust-lang/rust/assets/1606434/5aecccf8-a6ee-4469-8b39-72fb0d979a9f)
diff --git a/tests/ui/empty_line_after/doc_comments.stderr b/tests/ui/empty_line_after/doc_comments.stderr
@@ -3,7 +3,7 @@ error: empty line after doc comment
    |
 LL | / /// for the crate
 LL | |
-   | |_
+   | |_^
 LL |   fn first_in_crate() {}
    |   ------------------- the comment documents this function
    |
@@ -22,7 +22,7 @@ error: empty line after doc comment
    |
 LL | /     /// for the module
 LL | |
-   | |_
+   | |_^
 LL |       fn first_in_module() {}
    |       -------------------- the comment documents this function
    |
@@ -39,7 +39,7 @@ error: empty line after doc comment
    |
 LL | /     /// # Indented
 LL | |
-   | |_
+   | |_^
 LL |       /// Blank line
 LL |       fn indented() {}
    |       ------------- the comment documents this function
@@ -55,7 +55,7 @@ error: empty line after doc comment
    |
 LL | / /// This should produce a warning
 LL | |
-   | |_
+   | |_^
 LL |   fn with_doc_and_newline() {}
    |   ------------------------- the comment documents this function
    |
@@ -69,7 +69,7 @@ LL | |
 LL | | /** This is also a doc comment and is part of the warning
 LL | |  */
 LL | |
-   | |_
+   | |_^
 ...
 LL |   fn three_attributes() {}
    |   --------------------- the comment documents this function
@@ -82,7 +82,7 @@ error: empty line after doc comment
 LL | /     /// docs for `old_code`
 LL | |     // fn old_code() {}
 LL | |
-   | |_
+   | |_^
 LL |       fn new_code() {}
    |       ------------- the comment documents this function
    |
@@ -102,7 +102,7 @@ LL | |     /// Docs
 LL | |     /// for OldB
 LL | |     // struct OldB;
 LL | |
-   | |_
+   | |_^
 ...
 LL |       struct Multiple;
    |       --------------- the comment documents this struct
@@ -125,7 +125,7 @@ LL | /     /**
 LL | |      * Meant to be inner doc comment
 LL | |      */
 LL | |
-   | |_
+   | |_^
 LL |       fn first_in_module() {}
    |       -------------------- the comment documents this function
    |
@@ -143,7 +143,7 @@ LL | |      * Docs for `old_code`
 LL | |      */
 LL | |     /* fn old_code() {} */
 LL | |
-   | |_
+   | |_^
 ...
 LL |       fn new_code() {}
    |       ------------- the comment documents this function
@@ -161,7 +161,7 @@ error: empty line after doc comment
 LL | /     /// Docs for `old_code2`
 LL | |     /* fn old_code2() {} */
 LL | |
-   | |_
+   | |_^
 LL |       /// Docs for `new_code2`
 LL |       fn new_code2() {}
    |       -------------- the comment documents this function
diff --git a/tests/ui/empty_line_after/outer_attribute.stderr b/tests/ui/empty_line_after/outer_attribute.stderr
@@ -3,7 +3,7 @@ error: empty line after outer attribute
    |
 LL | / #[crate_type = "lib"]
 LL | |
-   | |_
+   | |_^
 LL |   fn first_in_crate() {}
    |   ------------------- the attribute applies to this function
    |
@@ -20,7 +20,7 @@ error: empty line after outer attribute
    |
 LL | / #[inline]
 LL | |
-   | |_
+   | |_^
 LL |   /// some comment
 LL |   fn with_one_newline_and_comment() {}
    |   --------------------------------- the attribute applies to this function
@@ -32,7 +32,7 @@ error: empty line after outer attribute
    |
 LL | / #[inline]
 LL | |
-   | |_
+   | |_^
 LL |   fn with_one_newline() {}
    |   --------------------- the attribute applies to this function
    |
@@ -44,7 +44,7 @@ error: empty lines after outer attribute
 LL | /     #[crate_type = "lib"]
 LL | |
 LL | |
-   | |_
+   | |_^
 LL |       fn with_two_newlines() {}
    |       ---------------------- the attribute applies to this function
    |
@@ -59,7 +59,7 @@ error: empty line after outer attribute
    |
 LL | / #[doc = "doc attributes should be considered attributes"]
 LL | |
-   | |_
+   | |_^
 LL |   enum Baz {
    |   -------- the attribute applies to this enum
    |
@@ -70,7 +70,7 @@ error: empty line after outer attribute
    |
 LL | / #[repr(C)]
 LL | |
-   | |_
+   | |_^
 LL |   struct Foo {
    |   ---------- the attribute applies to this struct
    |
@@ -81,7 +81,7 @@ error: empty line after outer attribute
    |
 LL | / #[allow(dead_code)]
 LL | |
-   | |_
+   | |_^
 LL |   mod foo {}
    |   ------- the attribute applies to this module
    |
@@ -93,7 +93,7 @@ error: empty line after outer attribute
 LL | / #[inline]
 LL | | // Still lint cases where the empty line does not immediately follow the attribute
 LL | |
-   | |_
+   | |_^
 LL |   fn comment_before_empty_line() {}
    |   ------------------------------ the attribute applies to this function
    |
@@ -106,7 +106,7 @@ LL | / #[allow(unused)]
 LL | |
 LL | | // This comment is isolated
 LL | |
-   | |_
+   | |_^
 LL |   pub fn isolated_comment() {}
    |   ------------------------- the attribute applies to this function
    |
diff --git a/tests/ui/four_forward_slashes.stderr b/tests/ui/four_forward_slashes.stderr
@@ -3,7 +3,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
    |
 LL | / //// whoops
 LL | | fn a() {}
-   | |_
+   | |_^
    |
    = note: `-D clippy::four-forward-slashes` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::four_forward_slashes)]`
@@ -18,7 +18,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
 LL | / //// whoops
 LL | | #[allow(dead_code)]
 LL | | fn b() {}
-   | |_
+   | |_^
    |
 help: make this a doc comment by removing one `/`
    |
@@ -32,7 +32,7 @@ LL | / //// whoops
 LL | | //// two borked comments!
 LL | | #[track_caller]
 LL | | fn c() {}
-   | |_
+   | |_^
    |
 help: turn these into doc comments by removing one `/`
    |
@@ -46,7 +46,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
 LL | / //// between attributes
 LL | | #[allow(dead_code)]
 LL | | fn g() {}
-   | |_
+   | |_^
    |
 help: make this a doc comment by removing one `/`
    |
@@ -58,7 +58,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
    |
 LL | /     //// not very start of contents
 LL | | fn h() {}
-   | |_
+   | |_^
    |
 help: make this a doc comment by removing one `/`
    |
diff --git a/tests/ui/four_forward_slashes_first_line.stderr b/tests/ui/four_forward_slashes_first_line.stderr
@@ -3,7 +3,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
    |
 LL | / //// borked doc comment on the first line. doesn't combust!
 LL | | fn a() {}
-   | |_
+   | |_^
    |
    = note: `-D clippy::four-forward-slashes` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::four_forward_slashes)]`
diff --git a/tests/ui/too_long_first_doc_paragraph-fix.stderr b/tests/ui/too_long_first_doc_paragraph-fix.stderr
@@ -6,7 +6,7 @@ LL | | /// A much longer explanation that goes into a lot more detail about
 LL | | /// how the thing works, possibly with doclinks and so one,
 LL | | /// and probably spanning a many rows. Blablabla, it needs to be over
 LL | | /// 200 characters so I needed to write something longeeeeeeer.
-   | |_
+   | |_^
    |
    = note: `-D clippy::too-long-first-doc-paragraph` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::too_long_first_doc_paragraph)]`
diff --git a/tests/ui/too_long_first_doc_paragraph.stderr b/tests/ui/too_long_first_doc_paragraph.stderr
@@ -23,7 +23,7 @@ error: first doc comment paragraph is too long
 LL | / /// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc turpis nunc, lacinia
 LL | | /// a dolor in, pellentesque aliquet enim. Cras nec maximus sem. Mauris arcu libero,
 LL | | /// gravida non lacinia at, rhoncus eu lacus.
-   | |_
+   | |_^
 
 error: first doc comment paragraph is too long
   --> tests/ui/too_long_first_doc_paragraph.rs:36:1
@@ -32,7 +32,7 @@ LL | / /// Lorem
 LL | | /// ipsum dolor sit amet, consectetur adipiscing elit. Nunc turpis nunc, lacinia
 LL | | /// a dolor in, pellentesque aliquet enim. Cras nec maximus sem. Mauris arcu libero,
 LL | | /// gravida non lacinia at, rhoncus eu lacus.
-   | |_
+   | |_^
 
 error: aborting due to 3 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ error: empty line after outer attribute`
`3`	`3`	`\|`
`4`	`4`	`LL \| / #[crate_type = "lib"]`
`5`	`5`	`LL \| \|`
`6`		`- \| \|_`
	`6`	`+ \| \|_^`
`7`	`7`	`LL \| fn first_in_crate() {}`
`8`	`8`	`\| ------------------- the attribute applies to this function`
`9`	`9`	`\|`
`@@ -20,7 +20,7 @@ error: empty line after outer attribute`
`20`	`20`	`\|`
`21`	`21`	`LL \| / #[inline]`
`22`	`22`	`LL \| \|`
`23`		`- \| \|_`
	`23`	`+ \| \|_^`
`24`	`24`	`LL \| /// some comment`
`25`	`25`	`LL \| fn with_one_newline_and_comment() {}`
`26`	`26`	`\| --------------------------------- the attribute applies to this function`
`@@ -32,7 +32,7 @@ error: empty line after outer attribute`
`32`	`32`	`\|`
`33`	`33`	`LL \| / #[inline]`
`34`	`34`	`LL \| \|`
`35`		`- \| \|_`
	`35`	`+ \| \|_^`
`36`	`36`	`LL \| fn with_one_newline() {}`
`37`	`37`	`\| --------------------- the attribute applies to this function`
`38`	`38`	`\|`
`@@ -44,7 +44,7 @@ error: empty lines after outer attribute`
`44`	`44`	`LL \| / #[crate_type = "lib"]`
`45`	`45`	`LL \| \|`
`46`	`46`	`LL \| \|`
`47`		`- \| \|_`
	`47`	`+ \| \|_^`
`48`	`48`	`LL \| fn with_two_newlines() {}`
`49`	`49`	`\| ---------------------- the attribute applies to this function`
`50`	`50`	`\|`
`@@ -59,7 +59,7 @@ error: empty line after outer attribute`
`59`	`59`	`\|`
`60`	`60`	`LL \| / #[doc = "doc attributes should be considered attributes"]`
`61`	`61`	`LL \| \|`
`62`		`- \| \|_`
	`62`	`+ \| \|_^`
`63`	`63`	`LL \| enum Baz {`
`64`	`64`	`\| -------- the attribute applies to this enum`
`65`	`65`	`\|`
`@@ -70,7 +70,7 @@ error: empty line after outer attribute`
`70`	`70`	`\|`
`71`	`71`	`LL \| / #[repr(C)]`
`72`	`72`	`LL \| \|`
`73`		`- \| \|_`
	`73`	`+ \| \|_^`
`74`	`74`	`LL \| struct Foo {`
`75`	`75`	`\| ---------- the attribute applies to this struct`
`76`	`76`	`\|`
`@@ -81,7 +81,7 @@ error: empty line after outer attribute`
`81`	`81`	`\|`
`82`	`82`	`LL \| / #[allow(dead_code)]`
`83`	`83`	`LL \| \|`
`84`		`- \| \|_`
	`84`	`+ \| \|_^`
`85`	`85`	`LL \| mod foo {}`
`86`	`86`	`\| ------- the attribute applies to this module`
`87`	`87`	`\|`
`@@ -93,7 +93,7 @@ error: empty line after outer attribute`
`93`	`93`	`LL \| / #[inline]`
`94`	`94`	`LL \| \| // Still lint cases where the empty line does not immediately follow the attribute`
`95`	`95`	`LL \| \|`
`96`		`- \| \|_`
	`96`	`+ \| \|_^`
`97`	`97`	`LL \| fn comment_before_empty_line() {}`
`98`	`98`	`\| ------------------------------ the attribute applies to this function`
`99`	`99`	`\|`
`@@ -106,7 +106,7 @@ LL \| / #[allow(unused)]`
`106`	`106`	`LL \| \|`
`107`	`107`	`LL \| \| // This comment is isolated`
`108`	`108`	`LL \| \|`
`109`		`- \| \|_`
	`109`	`+ \| \|_^`
`110`	`110`	`LL \| pub fn isolated_comment() {}`
`111`	`111`	`\| ------------------------- the attribute applies to this function`
`112`	`112`	`\|`
Original file line number	Diff line number	Diff line change
@@ -3,7 +3,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
`3`	`3`	`\|`
`4`	`4`	`LL \| / //// whoops`
`5`	`5`	`LL \| \| fn a() {}`
`6`		`- \| \|_`
	`6`	`+ \| \|_^`
`7`	`7`	`\|`
`8`	`8`	= note: `-D clippy::four-forward-slashes` implied by `-D warnings`
`9`	`9`	= help: to override `-D warnings` add `#[allow(clippy::four_forward_slashes)]`
@@ -18,7 +18,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
`18`	`18`	`LL \| / //// whoops`
`19`	`19`	`LL \| \| #[allow(dead_code)]`
`20`	`20`	`LL \| \| fn b() {}`
`21`		`- \| \|_`
	`21`	`+ \| \|_^`
`22`	`22`	`\|`
`23`	`23`	help: make this a doc comment by removing one `/`
`24`	`24`	`\|`
`@@ -32,7 +32,7 @@ LL \| / //// whoops`
`32`	`32`	`LL \| \| //// two borked comments!`
`33`	`33`	`LL \| \| #[track_caller]`
`34`	`34`	`LL \| \| fn c() {}`
`35`		`- \| \|_`
	`35`	`+ \| \|_^`
`36`	`36`	`\|`
`37`	`37`	help: turn these into doc comments by removing one `/`
`38`	`38`	`\|`
@@ -46,7 +46,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
`46`	`46`	`LL \| / //// between attributes`
`47`	`47`	`LL \| \| #[allow(dead_code)]`
`48`	`48`	`LL \| \| fn g() {}`
`49`		`- \| \|_`
	`49`	`+ \| \|_^`
`50`	`50`	`\|`
`51`	`51`	help: make this a doc comment by removing one `/`
`52`	`52`	`\|`
@@ -58,7 +58,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
`58`	`58`	`\|`
`59`	`59`	`LL \| / //// not very start of contents`
`60`	`60`	`LL \| \| fn h() {}`
`61`		`- \| \|_`
	`61`	`+ \| \|_^`
`62`	`62`	`\|`
`63`	`63`	help: make this a doc comment by removing one `/`
`64`	`64`	`\|`
Original file line number	Diff line number	Diff line change
@@ -3,7 +3,7 @@ error: this item has comments with 4 forward slashes (`////`). These look like d
`3`	`3`	`\|`
`4`	`4`	`LL \| / //// borked doc comment on the first line. doesn't combust!`
`5`	`5`	`LL \| \| fn a() {}`
`6`		`- \| \|_`
	`6`	`+ \| \|_^`
`7`	`7`	`\|`
`8`	`8`	= note: `-D clippy::four-forward-slashes` implied by `-D warnings`
`9`	`9`	= help: to override `-D warnings` add `#[allow(clippy::four_forward_slashes)]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| \| /// A much longer explanation that goes into a lot more detail about`
`6`	`6`	`LL \| \| /// how the thing works, possibly with doclinks and so one,`
`7`	`7`	`LL \| \| /// and probably spanning a many rows. Blablabla, it needs to be over`
`8`	`8`	`LL \| \| /// 200 characters so I needed to write something longeeeeeeer.`
`9`		`- \| \|_`
	`9`	`+ \| \|_^`
`10`	`10`	`\|`
`11`	`11`	= note: `-D clippy::too-long-first-doc-paragraph` implied by `-D warnings`
`12`	`12`	= help: to override `-D warnings` add `#[allow(clippy::too_long_first_doc_paragraph)]`