compiletest: Do not require annotations on empty labels and suggestions

Author: petrochenkov

src/tools/compiletest/src/json.rs

@@ -181,8 +181,6 @@ fn push_actual_errors(
         .filter(|(_, span)| Path::new(&span.file_name) == Path::new(&file_name))
         .collect();
 
-    let spans_in_this_file: Vec<_> = spans_info_in_this_file.iter().map(|(_, span)| span).collect();
-
     let primary_spans: Vec<_> = spans_info_in_this_file
         .iter()
         .filter(|(is_primary, _)| *is_primary)
@@ -280,7 +278,9 @@ fn push_actual_errors(
                     line_num: Some(span.line_start + index),
                     kind: ErrorKind::Suggestion,
                     msg: line.to_string(),
-                    require_annotation: true,
+                    // Empty suggestions (suggestions to remove something) are common
+                    // and annotating them in source is not useful.
+                    require_annotation: !line.is_empty(),
                 });
             }
         }
@@ -294,13 +294,16 @@ fn push_actual_errors(
     }
 
     // Add notes for any labels that appear in the message.
-    for span in spans_in_this_file.iter().filter(|span| span.label.is_some()) {
-        errors.push(Error {
-            line_num: Some(span.line_start),
-            kind: ErrorKind::Note,
-            msg: span.label.clone().unwrap(),
-            require_annotation: true,
-        });
+    for (_, span) in spans_info_in_this_file {
+        if let Some(label) = &span.label {
+            errors.push(Error {
+                line_num: Some(span.line_start),
+                kind: ErrorKind::Note,
+                msg: label.clone(),
+                // Empty labels (only underlining spans) are common and do not need annotations.
+                require_annotation: !label.is_empty(),
+            });
+        }
     }
 
     // Flatten out the children.

tests/incremental/circular-dependencies.rs

@@ -15,7 +15,6 @@ pub struct Foo;
 
 pub fn consume_foo(_: Foo) {}
 //[cfail2]~^ NOTE function defined here
-//[cfail2]~| NOTE
 
 pub fn produce_foo() -> Foo {
     Foo

tests/ui/consts/const_in_pattern/reject_non_structural.rs

@@ -93,7 +93,6 @@ fn main() {
     //~| NOTE constant of non-structural type
 
     trait Trait: Sized { const ASSOC: Option<Self>; } //~ NOTE constant defined here
-                                                      //~^ NOTE
     impl Trait for NoDerive { const ASSOC: Option<NoDerive> = Some(NoDerive); }
     match Some(NoDerive) { NoDerive::ASSOC => dbg!(NoDerive::ASSOC), _ => panic!("whoops"), };
     //~^ ERROR constant of non-structural type `NoDerive` in a pattern

tests/ui/consts/const_in_pattern/reject_non_structural.stderr

@@ -118,14 +118,14 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: constant of non-structural type `NoDerive` in a pattern
-  --> $DIR/reject_non_structural.rs:98:28
+  --> $DIR/reject_non_structural.rs:97:28
    |
 LL | struct NoDerive;
    | --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns
 ...
 LL |     trait Trait: Sized { const ASSOC: Option<Self>; }
    |     ------------------   ------------------------- constant defined here
-...
+LL |     impl Trait for NoDerive { const ASSOC: Option<NoDerive> = Some(NoDerive); }
 LL |     match Some(NoDerive) { NoDerive::ASSOC => dbg!(NoDerive::ASSOC), _ => panic!("whoops"), };
    |                            ^^^^^^^^^^^^^^^ constant of non-structural type
    |
@@ -136,7 +136,7 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: constant of non-structural type `NoDerive` in a pattern
-  --> $DIR/reject_non_structural.rs:103:28
+  --> $DIR/reject_non_structural.rs:102:28
    |
 LL | struct NoDerive;
    | --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns
@@ -153,7 +153,7 @@ LL | impl PartialEq for NoDerive { fn eq(&self, _: &Self) -> bool { false } }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: constant of non-structural type `NoDerive` in a pattern
-  --> $DIR/reject_non_structural.rs:108:29
+  --> $DIR/reject_non_structural.rs:107:29
    |
 LL | struct NoDerive;
    | --------------- `NoDerive` must be annotated with `#[derive(PartialEq)]` to be usable in patterns

tests/ui/fn/param-mismatch-foreign.rs

@@ -1,7 +1,6 @@
 extern "C" {
     fn foo(x: i32, y: u32, z: i32);
     //~^ NOTE function defined here
-    //~| NOTE
 }
 
 fn main() {

tests/ui/fn/param-mismatch-foreign.stderr

@@ -1,5 +1,5 @@
 error[E0061]: this function takes 3 arguments but 2 arguments were supplied
-  --> $DIR/param-mismatch-foreign.rs:8:5
+  --> $DIR/param-mismatch-foreign.rs:7:5
    |
 LL |     foo(1i32, 2i32);
    |     ^^^       ---- argument #2 of type `u32` is missing

tests/ui/fn/signature-error-reporting-under-verbose.rs

@@ -4,7 +4,6 @@ fn foo(_: i32, _: i32) {}
 
 fn needs_ptr(_: fn(i32, u32)) {}
 //~^ NOTE function defined here
-//~| NOTE
 
 fn main() {
     needs_ptr(foo);

tests/ui/fn/signature-error-reporting-under-verbose.stderr

@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/signature-error-reporting-under-verbose.rs:10:15
+  --> $DIR/signature-error-reporting-under-verbose.rs:9:15
    |
 LL |     needs_ptr(foo);
    |     --------- ^^^ expected fn pointer, found fn item

tests/ui/issues/issue-48131.rs

@@ -1,13 +1,12 @@
 // This note is annotated because the purpose of the test
 // is to ensure that certain other notes are not generated.
-#![deny(unused_unsafe)] //~ NOTE
+#![deny(unused_unsafe)]
 
 
 // (test that no note is generated on this unsafe fn)
 pub unsafe fn a() {
     fn inner() {
         unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
-                                     //~^ NOTE
     }
 
     inner()
@@ -18,7 +17,6 @@ pub fn b() {
     unsafe {
         fn inner() {
             unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
-                                         //~^ NOTE
         }
         // `()` is fine to zero-initialize as it is zero sized and inhabited.
         let () = ::std::mem::zeroed();

tests/ui/issues/issue-48131.stderr

@@ -11,7 +11,7 @@ LL | #![deny(unused_unsafe)]
    |         ^^^^^^^^^^^^^
 
 error: unnecessary `unsafe` block
-  --> $DIR/issue-48131.rs:20:13
+  --> $DIR/issue-48131.rs:19:13
    |
 LL |             unsafe { /* unnecessary */ }
    |             ^^^^^^ unnecessary `unsafe` block