Auto merge of #46116 - oli-obk:json_ui, r=nikomatsakis

Check //~ERROR comments in ui tests

r? @nikomatsakis

cc #44844 @Phlosioneer @estebank @petrochenkov

this depends on #46052 getting merged first (the commits are included in here)

The relevant changes of this PR are c2f0af7 and 979269b

Author: bors

src/librustc/session/mod.rs

@@ -355,12 +355,15 @@ impl Session {
 
     /// Analogous to calling methods on the given `DiagnosticBuilder`, but
     /// deduplicates on lint ID, span (if any), and message for this `Session`
-    /// if we're not outputting in JSON mode.
     fn diag_once<'a, 'b>(&'a self,
                          diag_builder: &'b mut DiagnosticBuilder<'a>,
                          method: DiagnosticBuilderMethod,
                          lint: &'static lint::Lint, message: &str, span: Option<Span>) {
-        let mut do_method = || {
+
+        let lint_id = DiagnosticMessageId::LintId(lint::LintId::of(lint));
+        let id_span_message = (lint_id, span, message.to_owned());
+        let fresh = self.one_time_diagnostics.borrow_mut().insert(id_span_message);
+        if fresh {
             match method {
                 DiagnosticBuilderMethod::Note => {
                     diag_builder.note(message);
@@ -369,22 +372,6 @@ impl Session {
                     diag_builder.span_note(span.expect("span_note expects a span"), message);
                 }
             }
-        };
-
-        match self.opts.error_format {
-            // when outputting JSON for tool consumption, the tool might want
-            // the duplicates
-            config::ErrorOutputType::Json(_) => {
-                do_method()
-            },
-            _ => {
-                let lint_id = DiagnosticMessageId::LintId(lint::LintId::of(lint));
-                let id_span_message = (lint_id, span, message.to_owned());
-                let fresh = self.one_time_diagnostics.borrow_mut().insert(id_span_message);
-                if fresh {
-                    do_method()
-                }
-            }
         }
     }
 

src/test/compile-fail/issue-31221.rs

@@ -13,8 +13,6 @@
 #![allow(non_snake_case)]
 #![deny(unreachable_patterns)]
 //~^ NOTE lint level defined here
-//~^^ NOTE lint level defined here
-//~^^^ NOTE lint level defined here
 
 #[derive(Clone, Copy)]
 enum Enum {

src/test/compile-fail/lint-output-format-2.rs

@@ -25,6 +25,5 @@ use lint_output_format::{foo, bar};
 fn main() { //~ ERROR: compilation successful
     let _x = foo();
     //~^ WARNING use of deprecated item 'lint_output_format::foo': text
-    //~| NOTE #[warn(deprecated)] on by default
     let _y = bar();
 }

src/test/compile-fail/lint-unconditional-recursion.rs

@@ -10,19 +10,7 @@
 
 #![deny(unconditional_recursion)]
 //~^ NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
-//~| NOTE lint level defined here
+
 #![allow(dead_code)]
 fn foo() { //~ ERROR function cannot return without recurring
     foo(); //~ NOTE recursive call site

src/test/ui-fulldeps/custom-derive/issue-36935.rs

@@ -15,7 +15,7 @@
 
 #[macro_use] extern crate plugin;
 
-#[derive(Foo, Bar)]
+#[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
 struct Baz {
     a: i32,
     b: i32,

src/test/ui-fulldeps/custom-derive/issue-36935.stderr

@@ -1,7 +1,7 @@
 error: proc-macro derive panicked
   --> $DIR/issue-36935.rs:18:15
    |
-18 | #[derive(Foo, Bar)]
+18 | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
    |               ^^^
    |
    = help: message: lolnope

src/test/ui-fulldeps/issue-44953/issue-44953.rs

@@ -13,7 +13,7 @@
 #![feature(proc_macro)]
 #![allow(unused_macros)]
 
-#[macro_use] extern crate log;
+#[macro_use] extern crate log; //~ ERROR use of unstable library feature
 
 pub fn main() {
     info!("This is a log message.");

src/test/ui-fulldeps/issue-44953/issue-44953.stderr

@@ -1,7 +1,7 @@
 error: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead? (see issue #27812)
   --> $DIR/issue-44953.rs:16:14
    |
-16 | #[macro_use] extern crate log;
+16 | #[macro_use] extern crate log; //~ ERROR use of unstable library feature
    |              ^^^^^^^^^^^^^^^^^
    |
    = help: add #![feature(rustc_private)] to the crate attributes to enable

src/test/ui-fulldeps/proc-macro/three-equals.rs

@@ -22,17 +22,17 @@ fn main() {
     three_equals!(===);
 
     // Need exactly three equals.
-    three_equals!(==);
+    three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
 
     // Need exactly three equals.
-    three_equals!(=====);
+    three_equals!(=====); //~ ERROR expected EOF
 
     // Only equals accepted.
-    three_equals!(abc);
+    three_equals!(abc); //~ ERROR expected `=`
 
     // Only equals accepted.
-    three_equals!(!!);
+    three_equals!(!!); //~ ERROR expected `=`
 
     // Only three characters expected.
-    three_equals!(===a);
+    three_equals!(===a); //~ ERROR expected EOF
 }

src/test/ui-fulldeps/proc-macro/three-equals.stderr

@@ -1,46 +1,46 @@
 error: found 2 equal signs, need exactly 3
   --> $DIR/three-equals.rs:25:5
    |
-25 |     three_equals!(==);
+25 |     three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
    |     ^^^^^^^^^^^^^^^^^^
    |
    = help: input must be: `===`
 
 error: expected EOF, found `=`.
   --> $DIR/three-equals.rs:28:21
    |
-28 |     three_equals!(=====);
+28 |     three_equals!(=====); //~ ERROR expected EOF
    |                     ^^
    |
 note: last good input was here
   --> $DIR/three-equals.rs:28:21
    |
-28 |     three_equals!(=====);
+28 |     three_equals!(=====); //~ ERROR expected EOF
    |                     ^^
    = help: input must be: `===`
 
 error: expected `=`, found `abc`.
   --> $DIR/three-equals.rs:31:19
    |
-31 |     three_equals!(abc);
+31 |     three_equals!(abc); //~ ERROR expected `=`
    |                   ^^^
 
 error: expected `=`, found `!`.
   --> $DIR/three-equals.rs:34:19
    |
-34 |     three_equals!(!!);
+34 |     three_equals!(!!); //~ ERROR expected `=`
    |                   ^
 
 error: expected EOF, found `a`.
   --> $DIR/three-equals.rs:37:22
    |
-37 |     three_equals!(===a);
+37 |     three_equals!(===a); //~ ERROR expected EOF
    |                      ^
    |
 note: last good input was here
   --> $DIR/three-equals.rs:37:21
    |
-37 |     three_equals!(===a);
+37 |     three_equals!(===a); //~ ERROR expected EOF
    |                     ^
    = help: input must be: `===`