Don't emit empty notes

oli-obk · oli-obk · commit 2e2a4797a26b · 2022-12-13T09:53:36.000Z
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
@@ -1431,25 +1431,27 @@ impl EmitterWriter {
                         };
                         for (i, annotation) in annotations.into_iter().enumerate() {
                             if let Some(label) = &annotation.label {
-                                let style = if annotation.is_primary {
-                                    Style::LabelPrimary
-                                } else {
-                                    Style::LabelSecondary
-                                };
-                                if annotation_id == 0 {
-                                    buffer.prepend(line_idx, " |", Style::LineNumber);
-                                    for _ in 0..max_line_num_len {
-                                        buffer.prepend(line_idx, " ", Style::NoStyle);
+                                if !label.is_empty() {
+                                    let style = if annotation.is_primary {
+                                        Style::LabelPrimary
+                                    } else {
+                                        Style::LabelSecondary
+                                    };
+                                    if annotation_id == 0 {
+                                        buffer.prepend(line_idx, " |", Style::LineNumber);
+                                        for _ in 0..max_line_num_len {
+                                            buffer.prepend(line_idx, " ", Style::NoStyle);
+                                        }
+                                        line_idx += 1;
+                                        buffer.append(line_idx + i, " = note: ", style);
+                                        for _ in 0..max_line_num_len {
+                                            buffer.prepend(line_idx, " ", Style::NoStyle);
+                                        }
+                                    } else {
+                                        buffer.append(line_idx + i, ": ", style);
                                     }
-                                    line_idx += 1;
-                                    buffer.append(line_idx + i, " = note: ", style);
-                                    for _ in 0..max_line_num_len {
-                                        buffer.prepend(line_idx, " ", Style::NoStyle);
-                                    }
-                                } else {
-                                    buffer.append(line_idx + i, ": ", style);
+                                    buffer.append(line_idx + i, label, style);
                                 }
-                                buffer.append(line_idx + i, label, style);
                             }
                         }
                     }
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
@@ -6,8 +6,6 @@ LL |     match x { }
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<i32>`
diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr
@@ -8,8 +8,6 @@ LL |     let Some(y) = x;
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<i32>`
 help: you might want to use `if let` to ignore the variant that isn't matched
diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr
@@ -6,8 +6,6 @@ LL |     for Some(x) in xs {}
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<i32>`
 
diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
@@ -8,8 +8,6 @@ LL |     let Ok(_x) = foo();
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Result<u32, !>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/result.rs:LL:COL: not covered
    = note: the matched value is of type `Result<u32, !>`
 help: you might want to use `if let` to ignore the variant that isn't matched
diff --git a/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr b/src/test/ui/pattern/suggest-adding-appropriate-missing-pattern-excluding-comments.stderr
@@ -6,8 +6,6 @@ LL |     match Some(1) {
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
diff --git a/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr b/src/test/ui/pattern/usefulness/doc-hidden-non-exhaustive.stderr
@@ -66,8 +66,6 @@ LL |     match None {
    |
 note: `Option<HiddenEnum>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<HiddenEnum>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
diff --git a/src/test/ui/pattern/usefulness/issue-35609.stderr b/src/test/ui/pattern/usefulness/issue-35609.stderr
@@ -107,8 +107,6 @@ LL |     match Some(A) {
    |
 note: `Option<Enum>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
    = note: the matched value is of type `Option<Enum>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown, or multiple match arms
    |
diff --git a/src/test/ui/pattern/usefulness/issue-3601.stderr b/src/test/ui/pattern/usefulness/issue-3601.stderr
@@ -8,7 +8,7 @@ note: `Box<ElementKind>` defined here
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
 $SRC_DIR/alloc/src/boxed.rs:LL:COL
 $SRC_DIR/alloc/src/boxed.rs:LL:COL
-$SRC_DIR/alloc/src/boxed.rs:LL:COL: 
+$SRC_DIR/alloc/src/boxed.rs:LL:COL
    = note: the matched value is of type `Box<ElementKind>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
    |
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics-2.stderr b/src/test/ui/pattern/usefulness/match-arm-statics-2.stderr
@@ -19,8 +19,6 @@ LL |     match Some(Some(North)) {
    |
 note: `Option<Option<Direction>>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
 : not covered
    = note: the matched value is of type `Option<Option<Direction>>`
diff --git a/src/test/ui/pattern/usefulness/match-privately-empty.stderr b/src/test/ui/pattern/usefulness/match-privately-empty.stderr
@@ -6,8 +6,6 @@ LL |     match private::DATA {
    |
 note: `Option<Private>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<Private>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
diff --git a/src/test/ui/pattern/usefulness/non-exhaustive-match.stderr b/src/test/ui/pattern/usefulness/non-exhaustive-match.stderr
@@ -36,8 +36,6 @@ LL |     match Some(10) {
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/option.rs:LL:COL: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr
@@ -8,8 +8,6 @@ LL |     let Ok(x) = res;
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Result<u32, &R<'_>>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/result.rs:LL:COL: not covered
    = note: the matched value is of type `Result<u32, &R<'_>>`
 help: you might want to use `if let` to ignore the variant that isn't matched
diff --git a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr
@@ -6,8 +6,6 @@ LL |     let _ = match x {
    |
 note: `Result<u32, &Void>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/result.rs:LL:COL: not covered
    = note: the matched value is of type `Result<u32, &Void>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
@@ -85,8 +83,6 @@ LL |     let _ = match x {
    |
 note: `Result<u32, Void>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/result.rs:LL:COL: not covered
    = note: the matched value is of type `Result<u32, Void>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
@@ -105,8 +101,6 @@ LL |     let Ok(x) = x;
    = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
 note: `Result<u32, Void>` defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: 
 $SRC_DIR/core/src/result.rs:LL:COL: not covered
    = note: the matched value is of type `Result<u32, Void>`
 help: you might want to use `if let` to ignore the variant that isn't matched

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ LL \| match x { }`
`6`	`6`	`\|`
`7`	`7`	note: `Option<i32>` defined here
`8`	`8`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`9`		`- \|`
`10`		`- = note:`
`11`	`9`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`12`	`10`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`13`	`11`	= note: the matched value is of type `Option<i32>`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ LL \| for Some(x) in xs {}`
`6`	`6`	`\|`
`7`	`7`	note: `Option<i32>` defined here
`8`	`8`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`9`		`- \|`
`10`		`- = note:`
`11`	`9`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`12`	`10`	= note: the matched value is of type `Option<i32>`
`13`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ LL \| match Some(1) {`
`6`	`6`	`\|`
`7`	`7`	note: `Option<i32>` defined here
`8`	`8`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`9`		`- \|`
`10`		`- = note:`
`11`	`9`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`12`	`10`	= note: the matched value is of type `Option<i32>`
`13`	`11`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ LL \| match None {`
`66`	`66`	`\|`
`67`	`67`	note: `Option<HiddenEnum>` defined here
`68`	`68`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`69`		`- \|`
`70`		`- = note:`
`71`	`69`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`72`	`70`	= note: the matched value is of type `Option<HiddenEnum>`
`73`	`71`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,6 @@ LL \| match Some(A) {`
`107`	`107`	`\|`
`108`	`108`	note: `Option<Enum>` defined here
`109`	`109`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`110`		`- \|`
`111`		`- = note:`
`112`	`110`	= note: the matched value is of type `Option<Enum>`
`113`	`111`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown, or multiple match arms`
`114`	`112`	`\|`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ note: `Box<ElementKind>` defined here
`8`	`8`	`--> $SRC_DIR/alloc/src/boxed.rs:LL:COL`
`9`	`9`	`$SRC_DIR/alloc/src/boxed.rs:LL:COL`
`10`	`10`	`$SRC_DIR/alloc/src/boxed.rs:LL:COL`
`11`		`-$SRC_DIR/alloc/src/boxed.rs:LL:COL:`
	`11`	`+$SRC_DIR/alloc/src/boxed.rs:LL:COL`
`12`	`12`	= note: the matched value is of type `Box<ElementKind>`
`13`	`13`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown`
`14`	`14`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ LL \| match Some(Some(North)) {`
`19`	`19`	`\|`
`20`	`20`	note: `Option<Option<Direction>>` defined here
`21`	`21`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`22`		`- \|`
`23`		`- = note:`
`24`	`22`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`25`	`23`	`: not covered`
`26`	`24`	= note: the matched value is of type `Option<Option<Direction>>`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ LL \| match private::DATA {`
`6`	`6`	`\|`
`7`	`7`	note: `Option<Private>` defined here
`8`	`8`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`9`		`- \|`
`10`		`- = note:`
`11`	`9`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`12`	`10`	= note: the matched value is of type `Option<Private>`
`13`	`11`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ LL \| match Some(10) {`
`36`	`36`	`\|`
`37`	`37`	note: `Option<i32>` defined here
`38`	`38`	`--> $SRC_DIR/core/src/option.rs:LL:COL`
`39`		`- \|`
`40`		`- = note:`
`41`	`39`	`$SRC_DIR/core/src/option.rs:LL:COL: not covered`
`42`	`40`	= note: the matched value is of type `Option<i32>`
`43`	`41`	`help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown`