Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

425 files changed, 466 insertions, 486 deletions

diff --git a/tests/ui/issues/issue-10291.stderr b/tests/ui/issues/issue-10291.stderr
index a7b827d27..68ed9a0de 100644
--- a/tests/ui/issues/issue-10291.stderr
+++ b/tests/ui/issues/issue-10291.stderr
@@ -7,5 +7,5 @@ LL |     drop::<Box<dyn for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
 LL |         x
    |         ^ returning this value requires that `'x` must outlive `'static`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-102964.stderr b/tests/ui/issues/issue-102964.stderr
index c0766480a..0e2761f3f 100644
--- a/tests/ui/issues/issue-102964.stderr
+++ b/tests/ui/issues/issue-102964.stderr
@@ -14,6 +14,6 @@ LL ~     let rc = Rc::new(function);
 LL +     rc
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-10465.stderr b/tests/ui/issues/issue-10465.stderr
index 1b7b9d590..c6bc0786a 100644
--- a/tests/ui/issues/issue-10465.stderr
+++ b/tests/ui/issues/issue-10465.stderr
@@ -10,6 +10,6 @@ help: the following trait is implemented but not in scope; perhaps add a `use` f
 LL +         use a::A;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-10545.stderr b/tests/ui/issues/issue-10545.stderr
index f1da33eab..9aa042171 100644
--- a/tests/ui/issues/issue-10545.stderr
+++ b/tests/ui/issues/issue-10545.stderr
@@ -10,6 +10,6 @@ note: the struct `S` is defined here
 LL |     struct S;
    |     ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0603`.
diff --git a/tests/ui/issues/issue-10656.stderr b/tests/ui/issues/issue-10656.stderr
index 2e4365f1e..61828f9c0 100644
--- a/tests/ui/issues/issue-10656.stderr
+++ b/tests/ui/issues/issue-10656.stderr
@@ -11,5 +11,5 @@ note: the lint level is defined here
 LL | #![deny(missing_docs)]
    |         ^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-10764.stderr b/tests/ui/issues/issue-10764.stderr
index 4d8a85a13..f3bd0100a 100644
--- a/tests/ui/issues/issue-10764.stderr
+++ b/tests/ui/issues/issue-10764.stderr
@@ -14,6 +14,6 @@ note: function defined here
 LL | fn f(_: extern "Rust" fn()) {}
    |    ^ ---------------------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-11004.stderr b/tests/ui/issues/issue-11004.stderr
index b5831e42e..ea141e61d 100644
--- a/tests/ui/issues/issue-11004.stderr
+++ b/tests/ui/issues/issue-11004.stderr
@@ -3,7 +3,8 @@ error[E0609]: no field `x` on type `*mut A`
    |
 LL |     let x : i32 = n.x;
    |                   --^
-   |                   |
+   |                   | |
+   |                   | unknown field
    |                   help: `n` is a raw pointer; try dereferencing it: `(*n).x`
 
 error[E0609]: no field `y` on type `*mut A`
@@ -11,7 +12,8 @@ error[E0609]: no field `y` on type `*mut A`
    |
 LL |     let y : f64 = n.y;
    |                   --^
-   |                   |
+   |                   | |
+   |                   | unknown field
    |                   help: `n` is a raw pointer; try dereferencing it: `(*n).y`
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/issues/issue-11192.stderr b/tests/ui/issues/issue-11192.stderr
index fc1548013..a8a18c495 100644
--- a/tests/ui/issues/issue-11192.stderr
+++ b/tests/ui/issues/issue-11192.stderr
@@ -12,6 +12,6 @@ LL |     test(&*ptr);
    |     |
    |     mutable borrow later used by call
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0502`.
diff --git a/tests/ui/issues/issue-11374.stderr b/tests/ui/issues/issue-11374.stderr
index 879dc5b76..275a0e6b5 100644
--- a/tests/ui/issues/issue-11374.stderr
+++ b/tests/ui/issues/issue-11374.stderr
@@ -18,6 +18,6 @@ help: consider mutably borrowing here
 LL |     c.read_to(&mut v);
    |               ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-11593.stderr b/tests/ui/issues/issue-11593.stderr
index aa9768b18..8262bc932 100644
--- a/tests/ui/issues/issue-11593.stderr
+++ b/tests/ui/issues/issue-11593.stderr
@@ -10,6 +10,6 @@ note: the trait `Foo` is defined here
 LL | trait Foo {}
    | ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0603`.
diff --git a/tests/ui/issues/issue-11681.stderr b/tests/ui/issues/issue-11681.stderr
index f2f930766..4f23ba86e 100644
--- a/tests/ui/issues/issue-11681.stderr
+++ b/tests/ui/issues/issue-11681.stderr
@@ -6,6 +6,6 @@ LL |   let testValue = &Test;
 LL |   return testValue;
    |          ^^^^^^^^^ returns a value referencing data owned by the current function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0515`.
diff --git a/tests/ui/issues/issue-11692-1.stderr b/tests/ui/issues/issue-11692-1.stderr
index 386463436..46382f652 100644
--- a/tests/ui/issues/issue-11692-1.stderr
+++ b/tests/ui/issues/issue-11692-1.stderr
@@ -4,5 +4,5 @@ error: cannot find macro `testo` in this scope
 LL |     print!(testo!());
    |            ^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-11692-2.stderr b/tests/ui/issues/issue-11692-2.stderr
index 84746ca2c..53add509c 100644
--- a/tests/ui/issues/issue-11692-2.stderr
+++ b/tests/ui/issues/issue-11692-2.stderr
@@ -6,5 +6,5 @@ LL |     concat!(test!());
    |
    = note: `test` is in scope, but it is an attribute: `#[test]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-11844.stderr b/tests/ui/issues/issue-11844.stderr
index 9afd20977..9ff66eaef 100644
--- a/tests/ui/issues/issue-11844.stderr
+++ b/tests/ui/issues/issue-11844.stderr
@@ -9,6 +9,6 @@ LL |         Ok(a) =>
    = note: expected enum `Option<Box<{integer}>>`
               found enum `Result<_, _>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-12028.stderr b/tests/ui/issues/issue-12028.stderr
index 8d6b81c24..3d7fb13d4 100644
--- a/tests/ui/issues/issue-12028.stderr
+++ b/tests/ui/issues/issue-12028.stderr
@@ -10,6 +10,6 @@ help: try using a fully qualified path to specify the expected types
 LL |         <u8 as StreamHash<H>>::input_stream(self, &mut stream);
    |         ++++++++++++++++++++++++++++++++++++    ~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0284`.
diff --git a/tests/ui/issues/issue-12041.stderr b/tests/ui/issues/issue-12041.stderr
index b9ffa499a..51061c026 100644
--- a/tests/ui/issues/issue-12041.stderr
+++ b/tests/ui/issues/issue-12041.stderr
@@ -6,6 +6,6 @@ LL |             let tx = tx;
    |
    = note: move occurs because `tx` has type `Sender<i32>`, which does not implement the `Copy` trait
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-12127.stderr b/tests/ui/issues/issue-12127.stderr
index 2e5858679..2a6233547 100644
--- a/tests/ui/issues/issue-12127.stderr
+++ b/tests/ui/issues/issue-12127.stderr
@@ -13,6 +13,6 @@ LL |         f();
    |         ^
    = note: move occurs because `f` has type `{closure@$DIR/issue-12127.rs:8:24: 8:30}`, which does not implement the `Copy` trait
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-12187-1.stderr b/tests/ui/issues/issue-12187-1.stderr
index d2a6a9608..93dc1df8f 100644
--- a/tests/ui/issues/issue-12187-1.stderr
+++ b/tests/ui/issues/issue-12187-1.stderr
@@ -9,6 +9,6 @@ help: consider giving this pattern a type, where the type for type parameter `T`
 LL |     let &v: &T = new();
    |           ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-12187-2.stderr b/tests/ui/issues/issue-12187-2.stderr
index ac75ebb42..e9ba52ff4 100644
--- a/tests/ui/issues/issue-12187-2.stderr
+++ b/tests/ui/issues/issue-12187-2.stderr
@@ -9,6 +9,6 @@ help: consider giving this pattern a type, where the type for type parameter `T`
 LL |     let &v: &T = new();
    |           ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-12863.stderr b/tests/ui/issues/issue-12863.stderr
index 9c29a37cb..95d4a704e 100644
--- a/tests/ui/issues/issue-12863.stderr
+++ b/tests/ui/issues/issue-12863.stderr
@@ -4,6 +4,6 @@ error[E0532]: expected unit struct, unit variant or constant, found function `fo
 LL |         foo::bar => {}
    |         ^^^^^^^^ not a unit struct, unit variant or constant
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0532`.
diff --git a/tests/ui/issues/issue-13058.stderr b/tests/ui/issues/issue-13058.stderr
index 8368978de..7cc2860eb 100644
--- a/tests/ui/issues/issue-13058.stderr
+++ b/tests/ui/issues/issue-13058.stderr
@@ -7,6 +7,6 @@ LL | {
 LL |     let cont_iter = cont.iter();
    |                     ^^^^^^^^^^^ lifetime `'r` required
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0621`.
diff --git a/tests/ui/issues/issue-13167.rs b/tests/ui/issues/issue-13167.rs
index 9a9f129ec..747f652d4 100644
--- a/tests/ui/issues/issue-13167.rs
+++ b/tests/ui/issues/issue-13167.rs
@@ -1,7 +1,7 @@
 // check-pass
 // pretty-expanded FIXME #23616
 // revisions: current next
-//[next] compile-flags: -Ztrait-solver=next
+//[next] compile-flags: -Znext-solver
 
 use std::slice;
 
diff --git a/tests/ui/issues/issue-13407.rs b/tests/ui/issues/issue-13407.rs
index 7ea81ffb5..7794be37b 100644
--- a/tests/ui/issues/issue-13407.rs
+++ b/tests/ui/issues/issue-13407.rs
@@ -4,6 +4,6 @@ mod A {
 
 fn main() {
     A::C = 1;
-    //~^ ERROR: invalid left-hand side of assignment
-    //~| ERROR: struct `C` is private
+    //~^ ERROR: mismatched types
+    //~| ERROR: unit struct `C` is private
 }
diff --git a/tests/ui/issues/issue-13407.stderr b/tests/ui/issues/issue-13407.stderr
index 54b6c640d..ac2eb6581 100644
--- a/tests/ui/issues/issue-13407.stderr
+++ b/tests/ui/issues/issue-13407.stderr
@@ -10,15 +10,18 @@ note: the unit struct `C` is defined here
 LL |     struct C;
    |     ^^^^^^^^^
 
-error[E0070]: invalid left-hand side of assignment
-  --> $DIR/issue-13407.rs:6:10
+error[E0308]: mismatched types
+  --> $DIR/issue-13407.rs:6:5
    |
+LL |     struct C;
+   |     -------- unit struct defined here
+...
 LL |     A::C = 1;
-   |     ---- ^
+   |     ^^^^   - this expression has type `{integer}`
    |     |
-   |     cannot assign to this expression
+   |     expected integer, found `C`
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0070, E0603.
-For more information about an error, try `rustc --explain E0070`.
+Some errors have detailed explanations: E0308, E0603.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-13446.stderr b/tests/ui/issues/issue-13446.stderr
index 139c34c88..28c459e6e 100644
--- a/tests/ui/issues/issue-13446.stderr
+++ b/tests/ui/issues/issue-13446.stderr
@@ -8,6 +8,6 @@ LL | static VEC: [u32; 256] = vec![];
              found struct `Vec<_>`
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-13482-2.stderr b/tests/ui/issues/issue-13482-2.stderr
index ccab95878..87a6782a5 100644
--- a/tests/ui/issues/issue-13482-2.stderr
+++ b/tests/ui/issues/issue-13482-2.stderr
@@ -4,6 +4,6 @@ error[E0527]: pattern requires 0 elements but array has 2
 LL |         [] => None,
    |         ^^ expected 2 elements
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0527`.
diff --git a/tests/ui/issues/issue-13482.stderr b/tests/ui/issues/issue-13482.stderr
index 3eb05f504..6226c5808 100644
--- a/tests/ui/issues/issue-13482.stderr
+++ b/tests/ui/issues/issue-13482.stderr
@@ -4,6 +4,6 @@ error[E0527]: pattern requires 0 elements but array has 2
 LL |     [] => None,
    |     ^^ expected 2 elements
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0527`.
diff --git a/tests/ui/issues/issue-13497-2.stderr b/tests/ui/issues/issue-13497-2.stderr
index 8ad921027..e2ba1150d 100644
--- a/tests/ui/issues/issue-13497-2.stderr
+++ b/tests/ui/issues/issue-13497-2.stderr
@@ -9,6 +9,6 @@ LL |       rawLines
 LL | |         .iter().map(|l| l.trim()).collect()
    | |___________________________________________^ returns a value referencing data owned by the current function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0515`.
diff --git a/tests/ui/issues/issue-13497.stderr b/tests/ui/issues/issue-13497.stderr
index 4b1d979da..fb3de637a 100644
--- a/tests/ui/issues/issue-13497.stderr
+++ b/tests/ui/issues/issue-13497.stderr
@@ -5,11 +5,15 @@ LL |     &str
    |     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
-help: consider using the `'static` lifetime
+help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static`
    |
 LL |     &'static str
    |      +++++++
+help: instead, you are more likely to want to return an owned value
+   |
+LL |     String
+   |     ~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0106`.
diff --git a/tests/ui/issues/issue-1362.stderr b/tests/ui/issues/issue-1362.stderr
index babbb6e51..6f6fdff66 100644
--- a/tests/ui/issues/issue-1362.stderr
+++ b/tests/ui/issues/issue-1362.stderr
@@ -11,6 +11,6 @@ help: change the type of the numeric literal from `i32` to `u32`
 LL |   let x: u32 = 20u32;
    |                  ~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-13847.stderr b/tests/ui/issues/issue-13847.stderr
index 52b8dc049..1c1855ce9 100644
--- a/tests/ui/issues/issue-13847.stderr
+++ b/tests/ui/issues/issue-13847.stderr
@@ -2,8 +2,8 @@ error[E0609]: no field `is_failure` on type `!`
   --> $DIR/issue-13847.rs:2:12
    |
 LL |     return.is_failure
-   |            ^^^^^^^^^^
+   |            ^^^^^^^^^^ unknown field
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-14091-2.stderr b/tests/ui/issues/issue-14091-2.stderr
index f8375d4ef..ac8947670 100644
--- a/tests/ui/issues/issue-14091-2.stderr
+++ b/tests/ui/issues/issue-14091-2.stderr
@@ -13,6 +13,6 @@ note: the trait `Not` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0600`.
diff --git a/tests/ui/issues/issue-14091.stderr b/tests/ui/issues/issue-14091.stderr
index 0a9640a9e..83879583b 100644
--- a/tests/ui/issues/issue-14091.stderr
+++ b/tests/ui/issues/issue-14091.stderr
@@ -4,6 +4,6 @@ error[E0308]: mismatched types
 LL |     assert!(1,1);
    |     ^^^^^^^^^^^^ expected `bool`, found integer
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-14092.stderr b/tests/ui/issues/issue-14092.stderr
index 3a43627e6..0de7b902f 100644
--- a/tests/ui/issues/issue-14092.stderr
+++ b/tests/ui/issues/issue-14092.stderr
@@ -9,6 +9,6 @@ help: add missing generic argument
 LL | fn fn1(0: Box<T>) {}
    |              +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0107`.
diff --git a/tests/ui/issues/issue-14285.stderr b/tests/ui/issues/issue-14285.stderr
index 5c0706601..4f89ae511 100644
--- a/tests/ui/issues/issue-14285.stderr
+++ b/tests/ui/issues/issue-14285.stderr
@@ -6,6 +6,6 @@ LL | fn foo<'a>(a: &dyn Foo) -> B<'a> {
 LL |     B(a)
    |     ^^^^ lifetime `'a` required
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0621`.
diff --git a/tests/ui/issues/issue-14366.stderr b/tests/ui/issues/issue-14366.stderr
index df61aabf0..e7bf555c1 100644
--- a/tests/ui/issues/issue-14366.stderr
+++ b/tests/ui/issues/issue-14366.stderr
@@ -11,6 +11,6 @@ help: consider borrowing the value, since `&&'static str` can be coerced into `&
 LL |     let _x = &"test" as &dyn (::std::any::Any);
    |              +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-1448-2.stderr b/tests/ui/issues/issue-1448-2.stderr
index 203dd92c9..a6f1daefe 100644
--- a/tests/ui/issues/issue-1448-2.stderr
+++ b/tests/ui/issues/issue-1448-2.stderr
@@ -16,6 +16,6 @@ help: change the type of the numeric literal from `i32` to `u32`
 LL |     println!("{}", foo(10u32));
    |                          ~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-14541.stderr b/tests/ui/issues/issue-14541.stderr
index b80c68ce4..370e64779 100644
--- a/tests/ui/issues/issue-14541.stderr
+++ b/tests/ui/issues/issue-14541.stderr
@@ -6,6 +6,6 @@ LL |     let Vec3 { y: _, z: _ } = v;
    |         |
    |         expected `Vec2`, found `Vec3`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-14721.stderr b/tests/ui/issues/issue-14721.stderr
index 49ebb2976..c71b0363e 100644
--- a/tests/ui/issues/issue-14721.stderr
+++ b/tests/ui/issues/issue-14721.stderr
@@ -2,8 +2,8 @@ error[E0609]: no field `desc` on type `&str`
   --> $DIR/issue-14721.rs:3:24
    |
 LL |     println!("{}", foo.desc);
-   |                        ^^^^
+   |                        ^^^^ unknown field
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-1476.stderr b/tests/ui/issues/issue-1476.stderr
index 670bd5463..e30dbfd20 100644
--- a/tests/ui/issues/issue-1476.stderr
+++ b/tests/ui/issues/issue-1476.stderr
@@ -4,6 +4,6 @@ error[E0425]: cannot find value `x` in this scope
 LL |     println!("{}", x);
    |                    ^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/issues/issue-14853.stderr b/tests/ui/issues/issue-14853.stderr
index 2adcf55ec..25dd1e337 100644
--- a/tests/ui/issues/issue-14853.stderr
+++ b/tests/ui/issues/issue-14853.stderr
@@ -7,6 +7,6 @@ LL |     fn yay<T: Debug>(_: Option<Self>, thing: &[T]);
 LL |     fn yay<T: Str>(_:Option<X>, thing: &[T]) {
    |               ^^^ impl has extra requirement `T: Str`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0276`.
diff --git a/tests/ui/issues/issue-14915.stderr b/tests/ui/issues/issue-14915.stderr
index 6e6326929..279f5772d 100644
--- a/tests/ui/issues/issue-14915.stderr
+++ b/tests/ui/issues/issue-14915.stderr
@@ -6,6 +6,6 @@ LL |     println!("{}", x + 1);
    |                    |
    |                    Box<isize>
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.
diff --git a/tests/ui/issues/issue-15034.stderr b/tests/ui/issues/issue-15034.stderr
index f142e260a..587a5c85e 100644
--- a/tests/ui/issues/issue-15034.stderr
+++ b/tests/ui/issues/issue-15034.stderr
@@ -6,6 +6,6 @@ LL |     pub fn new(lexer: &'a mut Lexer) -> Parser<'a> {
 LL |         Parser { lexer: lexer }
    |         ^^^^^^^^^^^^^^^^^^^^^^^ lifetime `'a` required
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0621`.
diff --git a/tests/ui/issues/issue-15094.stderr b/tests/ui/issues/issue-15094.stderr
index b7c950892..8e0fc8f17 100644
--- a/tests/ui/issues/issue-15094.stderr
+++ b/tests/ui/issues/issue-15094.stderr
@@ -7,6 +7,6 @@ LL |     fn call_once(self, _args: ()) {
    = note: expected signature `extern "rust-call" fn(Debuger<_>, ())`
               found signature `fn(Debuger<_>, ())`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0053`.
diff --git a/tests/ui/issues/issue-15207.stderr b/tests/ui/issues/issue-15207.stderr
index 25ce7cb5c..a1047e27b 100644
--- a/tests/ui/issues/issue-15207.stderr
+++ b/tests/ui/issues/issue-15207.stderr
@@ -4,6 +4,6 @@ error[E0599]: no method named `push` found for type `!` in the current scope
 LL |         break.push(1)
    |               ^^^^ method not found in `!`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-15381.stderr b/tests/ui/issues/issue-15381.stderr
index 085958411..03a0100f1 100644
--- a/tests/ui/issues/issue-15381.stderr
+++ b/tests/ui/issues/issue-15381.stderr
@@ -6,6 +6,6 @@ LL |     for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
    |
    = note: the matched value is of type `&[u8]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0005`.
diff --git a/tests/ui/issues/issue-15734.rs b/tests/ui/issues/issue-15734.rs
index 27410d4c3..77517f618 100644
--- a/tests/ui/issues/issue-15734.rs
+++ b/tests/ui/issues/issue-15734.rs
@@ -1,6 +1,6 @@
 // run-pass
 // revisions: current next
-//[next] compile-flags: -Ztrait-solver=next
+//[next] compile-flags: -Znext-solver
 
 use std::ops::Index;
 
diff --git a/tests/ui/issues/issue-15756.stderr b/tests/ui/issues/issue-15756.stderr
index d9bdc69ad..af50fe467 100644
--- a/tests/ui/issues/issue-15756.stderr
+++ b/tests/ui/issues/issue-15756.stderr
@@ -8,6 +8,6 @@ LL |     &mut something
    = note: all local variables must have a statically known size
    = help: unsized locals are gated as an unstable feature
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-15783.stderr b/tests/ui/issues/issue-15783.stderr
index 598ec7e60..7ed2e1991 100644
--- a/tests/ui/issues/issue-15783.stderr
+++ b/tests/ui/issues/issue-15783.stderr
@@ -14,6 +14,6 @@ note: function defined here
 LL | pub fn foo(params: Option<&[&str]>) -> usize {
    |        ^^^ -----------------------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-15896.stderr b/tests/ui/issues/issue-15896.stderr
index ec0d74596..381f6dc22 100644
--- a/tests/ui/issues/issue-15896.stderr
+++ b/tests/ui/issues/issue-15896.stderr
@@ -7,6 +7,6 @@ LL |         E::B(
 LL |           Tau{t: x},
    |           ^^^^^^^^^ expected `R`, found `Tau`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-15965.stderr b/tests/ui/issues/issue-15965.stderr
index fe06810b8..14727e743 100644
--- a/tests/ui/issues/issue-15965.stderr
+++ b/tests/ui/issues/issue-15965.stderr
@@ -6,6 +6,6 @@ LL | |
 LL | |     ()
    | |______^ cannot infer type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-16149.stderr b/tests/ui/issues/issue-16149.stderr
index bb809840b..9ffd0e7e6 100644
--- a/tests/ui/issues/issue-16149.stderr
+++ b/tests/ui/issues/issue-16149.stderr
@@ -7,6 +7,6 @@ LL |     static externalValue: isize;
 LL |         externalValue => true,
    |         ^^^^^^^^^^^^^ cannot be named the same as a static
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0530`.
diff --git a/tests/ui/issues/issue-16250.stderr b/tests/ui/issues/issue-16250.stderr
index 5eb5e0864..9d3e88114 100644
--- a/tests/ui/issues/issue-16250.stderr
+++ b/tests/ui/issues/issue-16250.stderr
@@ -18,5 +18,5 @@ LL | #![deny(warnings)]
    |         ^^^^^^^^
    = note: `#[deny(improper_ctypes)]` implied by `#[deny(warnings)]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-16338.stderr b/tests/ui/issues/issue-16338.stderr
index 0f08485e5..e24b9bfa3 100644
--- a/tests/ui/issues/issue-16338.stderr
+++ b/tests/ui/issues/issue-16338.stderr
@@ -9,6 +9,6 @@ LL |     let Slice { data: data, len: len } = "foo";
    = note: expected type `str`
             found struct `Slice<_>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-16401.stderr b/tests/ui/issues/issue-16401.stderr
index 02f9f3ea8..6af920ca4 100644
--- a/tests/ui/issues/issue-16401.stderr
+++ b/tests/ui/issues/issue-16401.stderr
@@ -9,6 +9,6 @@ LL |         Slice { data: data, len: len } => (),
    = note: expected unit type `()`
                  found struct `Slice<_>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-16562.stderr b/tests/ui/issues/issue-16562.stderr
index 3fe7507e8..efbd7f712 100644
--- a/tests/ui/issues/issue-16562.stderr
+++ b/tests/ui/issues/issue-16562.stderr
@@ -4,6 +4,6 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self
 LL | impl<T, M: MatrixShape> Collection for Col<M, usize> {
    |      ^ unconstrained type parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0207`.
diff --git a/tests/ui/issues/issue-16683.stderr b/tests/ui/issues/issue-16683.stderr
index fff681b2e..39b22ed1f 100644
--- a/tests/ui/issues/issue-16683.stderr
+++ b/tests/ui/issues/issue-16683.stderr
@@ -9,5 +9,5 @@ LL |     fn b(&self) {
 LL |         self.a();
    |         ^^^^^^^^ argument requires that `'1` must outlive `'a`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-16725.stderr b/tests/ui/issues/issue-16725.stderr
index 5f6eae73e..a4a406b3d 100644
--- a/tests/ui/issues/issue-16725.stderr
+++ b/tests/ui/issues/issue-16725.stderr
@@ -10,6 +10,6 @@ note: the function `bar` is defined here
 LL |     fn bar();
    |     ^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0603`.
diff --git a/tests/ui/issues/issue-16922.rs b/tests/ui/issues/issue-16922.rs
deleted file mode 100644
index bbbbf72db..000000000
--- a/tests/ui/issues/issue-16922.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::any::Any;
-
-fn foo<T: Any>(value: &T) -> Box<dyn Any> {
-    Box::new(value) as Box<dyn Any>
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn main() {
-    let _ = foo(&5);
-}
diff --git a/tests/ui/issues/issue-16922.stderr b/tests/ui/issues/issue-16922.stderr
deleted file mode 100644
index 9d9f32a97..000000000
--- a/tests/ui/issues/issue-16922.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error: lifetime may not live long enough
-  --> $DIR/issue-16922.rs:4:5
-   |
-LL | fn foo<T: Any>(value: &T) -> Box<dyn Any> {
-   |                       - let's call the lifetime of this reference `'1`
-LL |     Box::new(value) as Box<dyn Any>
-   |     ^^^^^^^^^^^^^^^ cast requires that `'1` must outlive `'static`
-   |
-help: to declare that the trait object captures data from argument `value`, you can add an explicit `'_` lifetime bound
-   |
-LL | fn foo<T: Any>(value: &T) -> Box<dyn Any + '_> {
-   |                                          ++++
-
-error: aborting due to previous error
-
diff --git a/tests/ui/issues/issue-16939.stderr b/tests/ui/issues/issue-16939.stderr
index 6db29bc61..229ff9f18 100644
--- a/tests/ui/issues/issue-16939.stderr
+++ b/tests/ui/issues/issue-16939.stderr
@@ -13,6 +13,6 @@ note: callable defined here
 LL | fn _foo<F: Fn()> (f: F) {
    |            ^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0057`.
diff --git a/tests/ui/issues/issue-16966.stderr b/tests/ui/issues/issue-16966.stderr
index c53707c5d..0ed12d3a2 100644
--- a/tests/ui/issues/issue-16966.stderr
+++ b/tests/ui/issues/issue-16966.stderr
@@ -11,6 +11,6 @@ LL |     panic!(std::default::Default::default());
 note: required by a bound in `begin_panic`
   --> $SRC_DIR/std/src/panicking.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0283`.
diff --git a/tests/ui/issues/issue-17001.stderr b/tests/ui/issues/issue-17001.stderr
index d7e606997..6ea32e0a4 100644
--- a/tests/ui/issues/issue-17001.stderr
+++ b/tests/ui/issues/issue-17001.stderr
@@ -4,6 +4,6 @@ error[E0574]: expected struct, variant or union type, found module `foo`
 LL |     let p = foo { x: () };
    |             ^^^ not a struct, variant or union type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0574`.
diff --git a/tests/ui/issues/issue-17033.stderr b/tests/ui/issues/issue-17033.stderr
index 3419c0798..0b4227422 100644
--- a/tests/ui/issues/issue-17033.stderr
+++ b/tests/ui/issues/issue-17033.stderr
@@ -11,6 +11,6 @@ help: consider mutably borrowing here
 LL |     (*p)(&mut ())
    |          ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-17252.stderr b/tests/ui/issues/issue-17252.stderr
index 32e20d774..d89848604 100644
--- a/tests/ui/issues/issue-17252.stderr
+++ b/tests/ui/issues/issue-17252.stderr
@@ -17,6 +17,6 @@ LL |     let _x: [u8; FOO]; // caused stack overflow prior to fix
    |                  ^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-17336.rs b/tests/ui/issues/issue-17336.rs
index 89ce59b11..97782ff9f 100644
--- a/tests/ui/issues/issue-17336.rs
+++ b/tests/ui/issues/issue-17336.rs
@@ -1,5 +1,8 @@
 // build-pass
+
 #![allow(unused_must_use)]
+#![allow(ambiguous_wide_pointer_comparisons)]
+
 #[allow(dead_code)]
 fn check(a: &str) {
     let x = a as *const str;
diff --git a/tests/ui/issues/issue-17337.stderr b/tests/ui/issues/issue-17337.stderr
index 55e51e566..8fbf68826 100644
--- a/tests/ui/issues/issue-17337.stderr
+++ b/tests/ui/issues/issue-17337.stderr
@@ -10,5 +10,5 @@ note: the lint level is defined here
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-17373.stderr b/tests/ui/issues/issue-17373.stderr
index 5c429d111..9438f5c63 100644
--- a/tests/ui/issues/issue-17373.stderr
+++ b/tests/ui/issues/issue-17373.stderr
@@ -4,6 +4,6 @@ error[E0614]: type `!` cannot be dereferenced
 LL |     *return
    |     ^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0614`.
diff --git a/tests/ui/issues/issue-17405.stderr b/tests/ui/issues/issue-17405.stderr
index 37274e239..47f5bf4dc 100644
--- a/tests/ui/issues/issue-17405.stderr
+++ b/tests/ui/issues/issue-17405.stderr
@@ -4,6 +4,6 @@ error[E0574]: expected struct, variant or union type, found enum `Foo`
 LL |         Foo { i } => ()
    |         ^^^ not a struct, variant or union type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0574`.
diff --git a/tests/ui/issues/issue-17551.stderr b/tests/ui/issues/issue-17551.stderr
index 3a8f569a3..68f54a310 100644
--- a/tests/ui/issues/issue-17551.stderr
+++ b/tests/ui/issues/issue-17551.stderr
@@ -9,6 +9,6 @@ help: consider giving `foo` an explicit type, where the type for type parameter
 LL |     let foo: B<T> = B(marker::PhantomData);
    |            ++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-17651.stderr b/tests/ui/issues/issue-17651.stderr
index b37811e19..0c95a3c0c 100644
--- a/tests/ui/issues/issue-17651.stderr
+++ b/tests/ui/issues/issue-17651.stderr
@@ -10,6 +10,6 @@ LL |     (|| Box::new(*(&[0][..])))();
 note: required by a bound in `Box::<T>::new`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-17758.stderr b/tests/ui/issues/issue-17758.stderr
index 613ef6b90..7a7d2374e 100644
--- a/tests/ui/issues/issue-17758.stderr
+++ b/tests/ui/issues/issue-17758.stderr
@@ -9,5 +9,5 @@ LL |     fn bar(&self) {
 LL |         self.foo();
    |         ^^^^^^^^^^ argument requires that `'1` must outlive `'a`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-17800.stderr b/tests/ui/issues/issue-17800.stderr
index baab67583..2a15af50d 100644
--- a/tests/ui/issues/issue-17800.stderr
+++ b/tests/ui/issues/issue-17800.stderr
@@ -9,6 +9,6 @@ help: use the tuple variant pattern syntax instead
 LL |         MyOption::MySome(42) => (),
    |                         ~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0769`.
diff --git a/tests/ui/issues/issue-17904-2.stderr b/tests/ui/issues/issue-17904-2.stderr
index 62b7b7953..102c8537f 100644
--- a/tests/ui/issues/issue-17904-2.stderr
+++ b/tests/ui/issues/issue-17904-2.stderr
@@ -6,6 +6,6 @@ LL | struct Foo<T> where T: Copy;
    |
    = help: consider removing `T`, referring to it in a field, or using a marker such as `PhantomData`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0392`.
diff --git a/tests/ui/issues/issue-17905-2.stderr b/tests/ui/issues/issue-17905-2.stderr
index 88b5fbec6..c66cb2224 100644
--- a/tests/ui/issues/issue-17905-2.stderr
+++ b/tests/ui/issues/issue-17905-2.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched `self` parameter type
 LL |     fn say(self: &Pair<&str, isize>) {
    |                  ^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected struct `Pair<&str, _>`
-              found struct `Pair<&str, _>`
+   = note: expected struct `Pair<&_, _>`
+              found struct `Pair<&_, _>`
 note: the anonymous lifetime defined here...
   --> $DIR/issue-17905-2.rs:8:24
    |
@@ -23,8 +23,8 @@ error[E0308]: mismatched `self` parameter type
 LL |     fn say(self: &Pair<&str, isize>) {
    |                  ^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected struct `Pair<&str, _>`
-              found struct `Pair<&str, _>`
+   = note: expected struct `Pair<&_, _>`
+              found struct `Pair<&_, _>`
 note: the anonymous lifetime as defined here...
   --> $DIR/issue-17905-2.rs:5:5
    |
diff --git a/tests/ui/issues/issue-17933.stderr b/tests/ui/issues/issue-17933.stderr
index 33534d3f8..42a7e0442 100644
--- a/tests/ui/issues/issue-17933.stderr
+++ b/tests/ui/issues/issue-17933.stderr
@@ -4,6 +4,6 @@ error[E0532]: expected unit struct, unit variant or constant, found static `self
 LL |         self::X => { },
    |         ^^^^^^^ not a unit struct, unit variant or constant
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0532`.
diff --git a/tests/ui/issues/issue-17954.stderr b/tests/ui/issues/issue-17954.stderr
index 3e3706bcb..bba7e725b 100644
--- a/tests/ui/issues/issue-17954.stderr
+++ b/tests/ui/issues/issue-17954.stderr
@@ -7,6 +7,6 @@ LL |     let a = &FOO;
 LL | }
    |  - end of enclosing function is here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0712`.
diff --git a/tests/ui/issues/issue-17959.stderr b/tests/ui/issues/issue-17959.stderr
index fb795febf..604413c4b 100644
--- a/tests/ui/issues/issue-17959.stderr
+++ b/tests/ui/issues/issue-17959.stderr
@@ -10,6 +10,6 @@ note: the implementor must specify the same requirement
 LL | struct G<T: ?Sized> {
    | ^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0367`.
diff --git a/tests/ui/issues/issue-17994.stderr b/tests/ui/issues/issue-17994.stderr
index 61e1e496f..ba3def64d 100644
--- a/tests/ui/issues/issue-17994.stderr
+++ b/tests/ui/issues/issue-17994.stderr
@@ -4,6 +4,6 @@ error[E0091]: type parameter `T` is unused
 LL | type Huh<T> where T: Tr = isize;
    |          ^ unused type parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0091`.
diff --git a/tests/ui/issues/issue-18058.stderr b/tests/ui/issues/issue-18058.stderr
index 18159ffc2..c880bb002 100644
--- a/tests/ui/issues/issue-18058.stderr
+++ b/tests/ui/issues/issue-18058.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `Undefined` in this scope
 LL | impl Undefined {}
    |      ^^^^^^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-18107.stderr b/tests/ui/issues/issue-18107.stderr
index cf4e06316..702207c30 100644
--- a/tests/ui/issues/issue-18107.stderr
+++ b/tests/ui/issues/issue-18107.stderr
@@ -17,6 +17,6 @@ LL |     match 0 {
 LL ~         _ => Box::new(unimplemented!())
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0746`.
diff --git a/tests/ui/issues/issue-18159.stderr b/tests/ui/issues/issue-18159.stderr
index 5e0589eed..5de13a5c3 100644
--- a/tests/ui/issues/issue-18159.stderr
+++ b/tests/ui/issues/issue-18159.stderr
@@ -9,6 +9,6 @@ help: consider giving `x` an explicit type
 LL |     let x: /* Type */;
    |          ++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-18183.stderr b/tests/ui/issues/issue-18183.stderr
index a7dc64708..11015d75d 100644
--- a/tests/ui/issues/issue-18183.stderr
+++ b/tests/ui/issues/issue-18183.stderr
@@ -4,6 +4,6 @@ error[E0128]: generic parameters with a default cannot use forward declared iden
 LL | pub struct Foo<Bar=Bar>(Bar);
    |                    ^^^ defaulted generic parameters cannot be forward declared
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0128`.
diff --git a/tests/ui/issues/issue-18423.stderr b/tests/ui/issues/issue-18423.stderr
index 5d154dbbb..2c6015eaa 100644
--- a/tests/ui/issues/issue-18423.stderr
+++ b/tests/ui/issues/issue-18423.stderr
@@ -6,6 +6,6 @@ LL |     x: Box<'a, isize>
    |        |
    |        expected 0 lifetime arguments
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0107`.
diff --git a/tests/ui/issues/issue-18446.stderr b/tests/ui/issues/issue-18446.stderr
index 602b80c68..d84c490df 100644
--- a/tests/ui/issues/issue-18446.stderr
+++ b/tests/ui/issues/issue-18446.stderr
@@ -19,6 +19,6 @@ help: disambiguate the method for candidate #2
 LL |     T::foo(&x);
    |     ~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0034`.
diff --git a/tests/ui/issues/issue-18532.stderr b/tests/ui/issues/issue-18532.stderr
index 4c224eb2d..059c7f137 100644
--- a/tests/ui/issues/issue-18532.stderr
+++ b/tests/ui/issues/issue-18532.stderr
@@ -6,6 +6,6 @@ LL |     (return)((),());
    |     |
    |     call expression requires function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-18566.stderr b/tests/ui/issues/issue-18566.stderr
index 8db78935f..e8ec48b0d 100644
--- a/tests/ui/issues/issue-18566.stderr
+++ b/tests/ui/issues/issue-18566.stderr
@@ -7,6 +7,6 @@ LL |     MyPtr(s).poke(s);
    |           |  first borrow later used by call
    |           first mutable borrow occurs here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0499`.
diff --git a/tests/ui/issues/issue-18611.stderr b/tests/ui/issues/issue-18611.stderr
index 784b9b984..ab2374586 100644
--- a/tests/ui/issues/issue-18611.stderr
+++ b/tests/ui/issues/issue-18611.stderr
@@ -10,6 +10,6 @@ help: this trait has no implementations, consider adding one
 LL | trait HasState {
    | ^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-18804/main.rs b/tests/ui/issues/issue-18804/main.rs
index c36048ea5..47c3f13d2 100644
--- a/tests/ui/issues/issue-18804/main.rs
+++ b/tests/ui/issues/issue-18804/main.rs
@@ -2,7 +2,6 @@
 // Test for issue #18804, #[linkage] does not propagate through generic
 // functions. Failure results in a linker error.
 
-// ignore-asmjs no weak symbol support
 // ignore-emscripten no weak symbol support
 // ignore-windows no extern_weak linkage
 // ignore-macos no extern_weak linkage
diff --git a/tests/ui/issues/issue-18819.stderr b/tests/ui/issues/issue-18819.stderr
index 40098f962..b2cf0bad1 100644
--- a/tests/ui/issues/issue-18819.stderr
+++ b/tests/ui/issues/issue-18819.stderr
@@ -25,6 +25,6 @@ help: provide the argument
 LL |     print_x(/* &dyn Foo<Item = bool> */, /* &str */);
    |            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.
diff --git a/tests/ui/issues/issue-18919.stderr b/tests/ui/issues/issue-18919.stderr
index b0b03a0ee..6dcd891ce 100644
--- a/tests/ui/issues/issue-18919.stderr
+++ b/tests/ui/issues/issue-18919.stderr
@@ -18,6 +18,6 @@ LL | enum Option<T> {
 LL |     Some(T),
    |          - ...if indirection were used here: `Box<T>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-18959.stderr b/tests/ui/issues/issue-18959.stderr
index b9e278736..76082dadd 100644
--- a/tests/ui/issues/issue-18959.stderr
+++ b/tests/ui/issues/issue-18959.stderr
@@ -13,6 +13,6 @@ LL | pub trait Bar: Foo { }
    |           --- this trait cannot be made into an object...
    = help: consider moving `foo` to another trait
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0038`.
diff --git a/tests/ui/issues/issue-1900.stderr b/tests/ui/issues/issue-1900.stderr
index ce413662f..31fd46c8e 100644
--- a/tests/ui/issues/issue-1900.stderr
+++ b/tests/ui/issues/issue-1900.stderr
@@ -4,6 +4,6 @@ error[E0131]: `main` function is not allowed to have generic parameters
 LL | fn main<T>() { }
    |        ^^^ `main` cannot have generic parameters
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0131`.
diff --git a/tests/ui/issues/issue-19086.stderr b/tests/ui/issues/issue-19086.stderr
index 90d0bb406..03b9249bb 100644
--- a/tests/ui/issues/issue-19086.stderr
+++ b/tests/ui/issues/issue-19086.stderr
@@ -7,6 +7,6 @@ LL |     FooB { x: i32, y: i32 }
 LL |         FooB(a, b) => println!("{} {}", a, b),
    |         ^^^^^^^^^^ help: use struct pattern syntax instead: `FooB { x: a, y: b }`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0532`.
diff --git a/tests/ui/issues/issue-1920-1.stderr b/tests/ui/issues/issue-1920-1.stderr
index a54692425..b7c7da006 100644
--- a/tests/ui/issues/issue-1920-1.stderr
+++ b/tests/ui/issues/issue-1920-1.stderr
@@ -10,6 +10,6 @@ note: required by a bound in `assert_clone`
 LL | fn assert_clone<T>() where T : Clone { }
    |                                ^^^^^ required by this bound in `assert_clone`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-1920-2.stderr b/tests/ui/issues/issue-1920-2.stderr
index 1083b0112..844cb0ff1 100644
--- a/tests/ui/issues/issue-1920-2.stderr
+++ b/tests/ui/issues/issue-1920-2.stderr
@@ -10,6 +10,6 @@ note: required by a bound in `assert_clone`
 LL | fn assert_clone<T>() where T : Clone { }
    |                                ^^^^^ required by this bound in `assert_clone`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-1920-3.stderr b/tests/ui/issues/issue-1920-3.stderr
index 3f0787c88..525ca4685 100644
--- a/tests/ui/issues/issue-1920-3.stderr
+++ b/tests/ui/issues/issue-1920-3.stderr
@@ -10,6 +10,6 @@ note: required by a bound in `assert_clone`
 LL | fn assert_clone<T>() where T : Clone { }
    |                                ^^^^^ required by this bound in `assert_clone`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-19244-1.stderr b/tests/ui/issues/issue-19244-1.stderr
index 1eb530542..9c1336402 100644
--- a/tests/ui/issues/issue-19244-1.stderr
+++ b/tests/ui/issues/issue-19244-1.stderr
@@ -2,8 +2,8 @@ error[E0609]: no field `1` on type `(usize,)`
   --> $DIR/issue-19244-1.rs:4:24
    |
 LL |     let a: [isize; TUP.1];
-   |                        ^
+   |                        ^ unknown field
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-19244-2.stderr b/tests/ui/issues/issue-19244-2.stderr
index 54529fdf5..533861b11 100644
--- a/tests/ui/issues/issue-19244-2.stderr
+++ b/tests/ui/issues/issue-19244-2.stderr
@@ -4,8 +4,8 @@ error[E0609]: no field `nonexistent_field` on type `MyStruct`
 LL |     let a: [isize; STRUCT.nonexistent_field];
    |                           ^^^^^^^^^^^^^^^^^ unknown field
    |
-   = note: available fields are: `field`
+   = note: available field is: `field`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-19482.stderr b/tests/ui/issues/issue-19482.stderr
index 90e6f7995..903a9f98c 100644
--- a/tests/ui/issues/issue-19482.stderr
+++ b/tests/ui/issues/issue-19482.stderr
@@ -7,6 +7,6 @@ LL |     type A;
 LL | fn bar(x: &dyn Foo) {}
    |                ^^^ help: specify the associated type: `Foo<A = Type>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0191`.
diff --git a/tests/ui/issues/issue-19521.stderr b/tests/ui/issues/issue-19521.stderr
index 13a12acb3..f451dc36d 100644
--- a/tests/ui/issues/issue-19521.stderr
+++ b/tests/ui/issues/issue-19521.stderr
@@ -4,6 +4,6 @@ error[E0599]: no method named `homura` found for reference `&'static str` in the
 LL |     "".homura()();
    |        ^^^^^^ method not found in `&str`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-1962.stderr b/tests/ui/issues/issue-1962.stderr
index 4c32a4cf3..db235d473 100644
--- a/tests/ui/issues/issue-1962.stderr
+++ b/tests/ui/issues/issue-1962.stderr
@@ -6,5 +6,5 @@ LL |     'a: while true {
    |
    = note: requested on the command line with `-D while-true`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-19692.stderr b/tests/ui/issues/issue-19692.stderr
index 9e888ed75..1e3d7a2e2 100644
--- a/tests/ui/issues/issue-19692.stderr
+++ b/tests/ui/issues/issue-19692.stderr
@@ -7,6 +7,6 @@ LL | struct Homura;
 LL |     let Some(ref madoka) = Some(homura.kaname());
    |                                        ^^^^^^ method not found in `Homura`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-19734.stderr b/tests/ui/issues/issue-19734.stderr
index 81757974d..ed48714fe 100644
--- a/tests/ui/issues/issue-19734.stderr
+++ b/tests/ui/issues/issue-19734.stderr
@@ -4,5 +4,5 @@ error: cannot find macro `undef` in this scope
 LL |     undef!();
    |     ^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-19922.stderr b/tests/ui/issues/issue-19922.stderr
index 826b2ac04..0355d3a89 100644
--- a/tests/ui/issues/issue-19922.stderr
+++ b/tests/ui/issues/issue-19922.stderr
@@ -6,6 +6,6 @@ LL |     let homura = Homura::Akemi { kaname: () };
    |
    = note: available fields are: `madoka`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0559`.
diff --git a/tests/ui/issues/issue-19991.stderr b/tests/ui/issues/issue-19991.stderr
index 57b0882b6..ff039f3ad 100644
--- a/tests/ui/issues/issue-19991.stderr
+++ b/tests/ui/issues/issue-19991.stderr
@@ -11,6 +11,6 @@ LL | |     };
    = note: `if` expressions without `else` evaluate to `()`
    = help: consider adding an `else` block that evaluates to the expected type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0317`.
diff --git a/tests/ui/issues/issue-20162.stderr b/tests/ui/issues/issue-20162.stderr
index ebdf2528f..8f45f0d36 100644
--- a/tests/ui/issues/issue-20162.stderr
+++ b/tests/ui/issues/issue-20162.stderr
@@ -12,6 +12,6 @@ LL + #[derive(Ord)]
 LL | struct X { x: i32 }
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-20225.stderr b/tests/ui/issues/issue-20225.stderr
index b34aa8e1f..2d24a5bbd 100644
--- a/tests/ui/issues/issue-20225.stderr
+++ b/tests/ui/issues/issue-20225.stderr
@@ -9,8 +9,8 @@ LL |   extern "rust-call" fn call(&self, (_,): (T,)) {}
    |                                           expected `&'a T`, found type parameter `T`
    |                                           help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected signature `extern "rust-call" fn(&Foo, (&'a T,))`
-              found signature `extern "rust-call" fn(&Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(&Foo, (&'a _,))`
+              found signature `extern "rust-call" fn(&Foo, (_,))`
 
 error[E0053]: method `call_mut` has an incompatible type for trait
   --> $DIR/issue-20225.rs:11:51
@@ -23,8 +23,8 @@ LL |   extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {}
    |                                                   expected `&'a T`, found type parameter `T`
    |                                                   help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected signature `extern "rust-call" fn(&mut Foo, (&'a T,))`
-              found signature `extern "rust-call" fn(&mut Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(&mut Foo, (&'a _,))`
+              found signature `extern "rust-call" fn(&mut Foo, (_,))`
 
 error[E0053]: method `call_once` has an incompatible type for trait
   --> $DIR/issue-20225.rs:18:47
@@ -38,8 +38,8 @@ LL |   extern "rust-call" fn call_once(self, (_,): (T,)) {}
    |                                               expected `&'a T`, found type parameter `T`
    |                                               help: change the parameter type to match the trait: `(&'a T,)`
    |
-   = note: expected signature `extern "rust-call" fn(Foo, (&'a T,))`
-              found signature `extern "rust-call" fn(Foo, (T,))`
+   = note: expected signature `extern "rust-call" fn(Foo, (&'a _,))`
+              found signature `extern "rust-call" fn(Foo, (_,))`
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/issues/issue-20261.stderr b/tests/ui/issues/issue-20261.stderr
index 9ac751e4d..6738708ca 100644
--- a/tests/ui/issues/issue-20261.stderr
+++ b/tests/ui/issues/issue-20261.stderr
@@ -4,6 +4,6 @@ error[E0282]: type annotations needed
 LL |         i.clone();
    |           ^^^^^ cannot infer type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-20313.stderr b/tests/ui/issues/issue-20313.stderr
index 7a0b344a5..f740b0cca 100644
--- a/tests/ui/issues/issue-20313.stderr
+++ b/tests/ui/issues/issue-20313.stderr
@@ -7,6 +7,6 @@ LL |     fn sqrt(x: f32) -> f32;
    = note: see issue #29602 <https://github.com/rust-lang/rust/issues/29602> for more information
    = help: add `#![feature(link_llvm_intrinsics)]` to the crate attributes to enable
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/issues/issue-20433.stderr b/tests/ui/issues/issue-20433.stderr
index 3ae952546..2dd0b3c2f 100644
--- a/tests/ui/issues/issue-20433.stderr
+++ b/tests/ui/issues/issue-20433.stderr
@@ -8,6 +8,6 @@ LL |     fn iceman(c: Vec<[i32]>) {}
 note: required by a bound in `Vec`
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-20714.stderr b/tests/ui/issues/issue-20714.stderr
index a3447aa68..f537a0158 100644
--- a/tests/ui/issues/issue-20714.stderr
+++ b/tests/ui/issues/issue-20714.stderr
@@ -15,6 +15,6 @@ LL -     let g = G();
 LL +     let g = G;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-20772.stderr b/tests/ui/issues/issue-20772.stderr
index 0c7e728c6..81f80aef5 100644
--- a/tests/ui/issues/issue-20772.stderr
+++ b/tests/ui/issues/issue-20772.stderr
@@ -12,6 +12,6 @@ LL | trait T : Iterator<Item=Self::Item>
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-20831-debruijn.stderr b/tests/ui/issues/issue-20831-debruijn.stderr
index c3af1f678..bd3ff5d59 100644
--- a/tests/ui/issues/issue-20831-debruijn.stderr
+++ b/tests/ui/issues/issue-20831-debruijn.stderr
@@ -22,6 +22,6 @@ LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher
    = note: expected `<MyStruct<'a> as Publisher<'_>>`
               found `<MyStruct<'_> as Publisher<'_>>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0495`.
diff --git a/tests/ui/issues/issue-20847.rs b/tests/ui/issues/issue-20847.rs
index 0cd7edf89..03e632263 100644
--- a/tests/ui/issues/issue-20847.rs
+++ b/tests/ui/issues/issue-20847.rs
@@ -1,8 +1,6 @@
 // run-pass
 #![feature(fn_traits)]
 
-use std::ops::Fn;
-
 fn say(x: u32, y: u32) {
     println!("{} {}", x, y);
 }
diff --git a/tests/ui/issues/issue-20939.stderr b/tests/ui/issues/issue-20939.stderr
index 3819a21a2..00357155c 100644
--- a/tests/ui/issues/issue-20939.stderr
+++ b/tests/ui/issues/issue-20939.stderr
@@ -4,6 +4,6 @@ error[E0371]: the object type `(dyn Foo + 'a)` automatically implements the trai
 LL | impl<'a> Foo for dyn Foo + 'a {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Foo + 'a)` automatically implements trait `Foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0371`.
diff --git a/tests/ui/issues/issue-21160.stderr b/tests/ui/issues/issue-21160.stderr
index b39a3aad3..892a4530e 100644
--- a/tests/ui/issues/issue-21160.stderr
+++ b/tests/ui/issues/issue-21160.stderr
@@ -13,6 +13,6 @@ LL + #[derive(Hash)]
 LL | struct Bar;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-21174.stderr b/tests/ui/issues/issue-21174.stderr
index 5981d9dc7..a6b75c913 100644
--- a/tests/ui/issues/issue-21174.stderr
+++ b/tests/ui/issues/issue-21174.stderr
@@ -7,6 +7,6 @@ LL |     let new: T::B = unsafe { std::mem::transmute(value) };
    = note: source type: `<T as Trait<'_>>::A` (this type does not have a fixed size)
    = note: target type: `<T as Trait<'_>>::B` (this type does not have a fixed size)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0512`.
diff --git a/tests/ui/issues/issue-21177.stderr b/tests/ui/issues/issue-21177.stderr
index 8b749edcc..9f66f43a1 100644
--- a/tests/ui/issues/issue-21177.stderr
+++ b/tests/ui/issues/issue-21177.stderr
@@ -12,6 +12,6 @@ LL | fn foo<T: Trait<A = T::B>>() { }
    |                     ^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-21202.stderr b/tests/ui/issues/issue-21202.stderr
index e7c3f2f9a..3485994e8 100644
--- a/tests/ui/issues/issue-21202.stderr
+++ b/tests/ui/issues/issue-21202.stderr
@@ -9,6 +9,6 @@ LL |         Foo::foo(&f);
 LL |         fn foo(&self) { }
    |         ------------- private method defined here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0624`.
diff --git a/tests/ui/issues/issue-21332.stderr b/tests/ui/issues/issue-21332.stderr
index 825492880..96e0f5fdb 100644
--- a/tests/ui/issues/issue-21332.stderr
+++ b/tests/ui/issues/issue-21332.stderr
@@ -10,6 +10,6 @@ LL |     fn next(&mut self) -> Result<i32, i32> { Ok(7) }
    = note: expected signature `fn(&mut S) -> Option<i32>`
               found signature `fn(&mut S) -> Result<i32, i32>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0053`.
diff --git a/tests/ui/issues/issue-21449.stderr b/tests/ui/issues/issue-21449.stderr
index ecaf6faba..cd1059d48 100644
--- a/tests/ui/issues/issue-21449.stderr
+++ b/tests/ui/issues/issue-21449.stderr
@@ -4,6 +4,6 @@ error[E0574]: expected struct, variant or union type, found module `MyMod`
 LL |     let myVar = MyMod { T: 0 };
    |                 ^^^^^ not a struct, variant or union type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0574`.
diff --git a/tests/ui/issues/issue-2150.stderr b/tests/ui/issues/issue-2150.stderr
index 26874faa2..a9268646e 100644
--- a/tests/ui/issues/issue-2150.stderr
+++ b/tests/ui/issues/issue-2150.stderr
@@ -12,5 +12,5 @@ note: the lint level is defined here
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-2151.stderr b/tests/ui/issues/issue-2151.stderr
index c75038b61..b130f1624 100644
--- a/tests/ui/issues/issue-2151.stderr
+++ b/tests/ui/issues/issue-2151.stderr
@@ -11,6 +11,6 @@ help: consider giving `x` an explicit type
 LL |     let x: /* Type */ = panic!();
    |          ++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-21554.stderr b/tests/ui/issues/issue-21554.stderr
index 6ea552a26..b1b59af6e 100644
--- a/tests/ui/issues/issue-21554.stderr
+++ b/tests/ui/issues/issue-21554.stderr
@@ -4,6 +4,6 @@ error[E0606]: casting `fn(i32) -> Inches {Inches}` as `f32` is invalid
 LL |     Inches as f32;
    |     ^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0606`.
diff --git a/tests/ui/issues/issue-21596.stderr b/tests/ui/issues/issue-21596.stderr
index a336d1b0e..8a7fca5f4 100644
--- a/tests/ui/issues/issue-21596.stderr
+++ b/tests/ui/issues/issue-21596.stderr
@@ -10,6 +10,6 @@ LL |     println!("{}", z.to_string());
            `*const u8: std::fmt::Display`
            which is required by `*const u8: ToString`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-21763.stderr b/tests/ui/issues/issue-21763.stderr
index a887635d3..135b705ee 100644
--- a/tests/ui/issues/issue-21763.stderr
+++ b/tests/ui/issues/issue-21763.stderr
@@ -7,7 +7,7 @@ LL |     foo::<HashMap<Rc<()>, Rc<()>>>();
    = help: within `(Rc<()>, Rc<()>)`, the trait `Send` is not implemented for `Rc<()>`
    = note: required because it appears within the type `(Rc<()>, Rc<()>)`
    = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send`
-note: required because it appears within the type `HashMap<Rc<()>, Rc<()>, RandomState>`
+note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>`
   --> $HASHBROWN_SRC_LOCATION
 note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>`
   --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
@@ -17,6 +17,6 @@ note: required by a bound in `foo`
 LL | fn foo<T: Send>() {}
    |           ^^^^ required by this bound in `foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-21837.stderr b/tests/ui/issues/issue-21837.stderr
index 3d3852664..f19893926 100644
--- a/tests/ui/issues/issue-21837.stderr
+++ b/tests/ui/issues/issue-21837.stderr
@@ -14,6 +14,6 @@ help: consider restricting type parameter `T`
 LL | impl<T: Bound> Trait2 for Foo<T> {}
    |       +++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-21946.stderr b/tests/ui/issues/issue-21946.stderr
index 67f6b3081..d1b4a808d 100644
--- a/tests/ui/issues/issue-21946.stderr
+++ b/tests/ui/issues/issue-21946.stderr
@@ -4,6 +4,6 @@ error[E0275]: overflow evaluating the requirement `<FooStruct as Foo>::A == _`
 LL |     type A = <FooStruct as Foo>::A;
    |              ^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0275`.
diff --git a/tests/ui/issues/issue-21974.stderr b/tests/ui/issues/issue-21974.stderr
index 2d60b18b1..3934846ea 100644
--- a/tests/ui/issues/issue-21974.stderr
+++ b/tests/ui/issues/issue-21974.stderr
@@ -12,6 +12,6 @@ LL |     where &'a T : Foo,
 LL |           &'b T : Foo
    |                   ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0283`.
diff --git a/tests/ui/issues/issue-22034.stderr b/tests/ui/issues/issue-22034.stderr
index d64b02409..6d899618d 100644
--- a/tests/ui/issues/issue-22034.stderr
+++ b/tests/ui/issues/issue-22034.stderr
@@ -8,6 +8,6 @@ LL |         &mut *(ptr as *mut dyn Fn())
    = note: wrap the `()` in a closure with no arguments: `|| { /* code */ }`
    = note: required for the cast from `*mut ()` to `*mut dyn Fn()`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-22289.stderr b/tests/ui/issues/issue-22289.stderr
index b594e8b7a..560fbc73b 100644
--- a/tests/ui/issues/issue-22289.stderr
+++ b/tests/ui/issues/issue-22289.stderr
@@ -9,6 +9,6 @@ help: consider borrowing the value
 LL |     &0 as &dyn std::any::Any;
    |     +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0605`.
diff --git a/tests/ui/issues/issue-22312.stderr b/tests/ui/issues/issue-22312.stderr
index da15c092f..be3f5ace5 100644
--- a/tests/ui/issues/issue-22312.stderr
+++ b/tests/ui/issues/issue-22312.stderr
@@ -9,6 +9,6 @@ help: consider borrowing the value
 LL |         let indexer = &(&*self as &dyn Index<usize, Output = <Self as Index<usize>>::Output>);
    |                         +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0605`.
diff --git a/tests/ui/issues/issue-22370.stderr b/tests/ui/issues/issue-22370.stderr
index cd27c4e4e..977cfe06b 100644
--- a/tests/ui/issues/issue-22370.stderr
+++ b/tests/ui/issues/issue-22370.stderr
@@ -9,6 +9,6 @@ LL | fn f(a: &dyn A) {}
    |
    = note: because of the default `Self` reference, type parameters must be specified on object types
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0393`.
diff --git a/tests/ui/issues/issue-22434.stderr b/tests/ui/issues/issue-22434.stderr
index dab62bcbb..172ae386c 100644
--- a/tests/ui/issues/issue-22434.stderr
+++ b/tests/ui/issues/issue-22434.stderr
@@ -7,6 +7,6 @@ LL |     type A;
 LL | type I<'a> = &'a (dyn Foo + 'a);
    |                       ^^^ help: specify the associated type: `Foo<A = Type>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0191`.
diff --git a/tests/ui/issues/issue-22468.stderr b/tests/ui/issues/issue-22468.stderr
index 3fff91acb..052888d20 100644
--- a/tests/ui/issues/issue-22468.stderr
+++ b/tests/ui/issues/issue-22468.stderr
@@ -7,7 +7,10 @@ LL |     let x = foo("baz");
    |             ^^^-------
    |             |
    |             call expression requires function
+...
+LL | fn foo(file: &str) -> bool {
+   | -------------------------- this function of the same name is available here, but it's shadowed by the local binding
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-22599.stderr b/tests/ui/issues/issue-22599.stderr
index 2b34830d0..b599f6feb 100644
--- a/tests/ui/issues/issue-22599.stderr
+++ b/tests/ui/issues/issue-22599.stderr
@@ -10,5 +10,5 @@ note: the lint level is defined here
 LL | #![deny(unused_variables)]
    |         ^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-22638.polonius.stderr b/tests/ui/issues/issue-22638.polonius.stderr
index 87a7c00e4..3a94ed7bd 100644
--- a/tests/ui/issues/issue-22638.polonius.stderr
+++ b/tests/ui/issues/issue-22638.polonius.stderr
@@ -11,5 +11,5 @@ LL |     pub fn matches<F: Fn()>(&self, f: &F) {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-22638.polonius/issue-22638.long-type.txt'
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-22638.rs b/tests/ui/issues/issue-22638.rs
index c2407227c..67fd147ae 100644
--- a/tests/ui/issues/issue-22638.rs
+++ b/tests/ui/issues/issue-22638.rs
@@ -1,6 +1,7 @@
 // build-fail
 // normalize-stderr-test: "<\{closure@.+`" -> "$$CLOSURE`"
 // normalize-stderr-test: ".nll/" -> "/"
+// ignore-compare-mode-next-solver (hangs)
 
 #![allow(unused)]
 
diff --git a/tests/ui/issues/issue-22638.stderr b/tests/ui/issues/issue-22638.stderr
index 1caa4221f..45290f6af 100644
--- a/tests/ui/issues/issue-22638.stderr
+++ b/tests/ui/issues/issue-22638.stderr
@@ -1,14 +1,14 @@
 error: reached the recursion limit while instantiating `A::matches::$CLOSURE`
-  --> $DIR/issue-22638.rs:56:9
+  --> $DIR/issue-22638.rs:57:9
    |
 LL |         a.matches(f)
    |         ^^^^^^^^^^^^
    |
 note: `A::matches` defined here
-  --> $DIR/issue-22638.rs:15:5
+  --> $DIR/issue-22638.rs:16:5
    |
 LL |     pub fn matches<F: Fn()>(&self, f: &F) {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-22684.stderr b/tests/ui/issues/issue-22684.stderr
index 2407ece5e..e2ca54cae 100644
--- a/tests/ui/issues/issue-22684.stderr
+++ b/tests/ui/issues/issue-22684.stderr
@@ -6,6 +6,6 @@ LL |     let _: () = foo::Foo.bar();
    |            |
    |            expected due to this
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-22706.stderr b/tests/ui/issues/issue-22706.stderr
index 5366a36b1..309e11a25 100644
--- a/tests/ui/issues/issue-22706.stderr
+++ b/tests/ui/issues/issue-22706.stderr
@@ -6,6 +6,6 @@ LL | fn is_copy<T: ::std::marker<i32>::Copy>() {}
    |                      |
    |                      not allowed on module `marker`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0109`.
diff --git a/tests/ui/issues/issue-2281-part1.stderr b/tests/ui/issues/issue-2281-part1.stderr
index c2391a7c0..47a1ef8cc 100644
--- a/tests/ui/issues/issue-2281-part1.stderr
+++ b/tests/ui/issues/issue-2281-part1.stderr
@@ -4,6 +4,6 @@ error[E0425]: cannot find value `foobar` in this scope
 LL | fn main() { println!("{}", foobar); }
    |                            ^^^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/issues/issue-22872.stderr b/tests/ui/issues/issue-22872.stderr
index 63222d25c..6ff710b11 100644
--- a/tests/ui/issues/issue-22872.stderr
+++ b/tests/ui/issues/issue-22872.stderr
@@ -19,6 +19,6 @@ help: consider further restricting the associated type
 LL | fn push_process<P>(process: P) where P: Process<'static>, <P as Process<'_>>::Item: Iterator {
    |                                                         ++++++++++++++++++++++++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-22874.stderr b/tests/ui/issues/issue-22874.stderr
index d64899080..717ce72b9 100644
--- a/tests/ui/issues/issue-22874.stderr
+++ b/tests/ui/issues/issue-22874.stderr
@@ -7,6 +7,6 @@ LL |     rows: [[String]],
    = help: the trait `Sized` is not implemented for `[String]`
    = note: slice and array elements must have `Sized` type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-22886.stderr b/tests/ui/issues/issue-22886.stderr
index c4b396559..a04fa677f 100644
--- a/tests/ui/issues/issue-22886.stderr
+++ b/tests/ui/issues/issue-22886.stderr
@@ -4,6 +4,6 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait,
 LL | impl<'a> Iterator for Newtype {
    |      ^^ unconstrained lifetime parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0207`.
diff --git a/tests/ui/issues/issue-22933-2.stderr b/tests/ui/issues/issue-22933-2.stderr
index 1a0e87e15..8cda8598f 100644
--- a/tests/ui/issues/issue-22933-2.stderr
+++ b/tests/ui/issues/issue-22933-2.stderr
@@ -10,6 +10,6 @@ LL |     ApplePie = Delicious::Apple as isize | Delicious::PIE as isize,
    |                                                       variant or associated item not found in `Delicious`
    |                                                       help: there is a variant with a similar name: `Pie`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-23041.stderr b/tests/ui/issues/issue-23041.stderr
index 4271c67c3..0142926dd 100644
--- a/tests/ui/issues/issue-23041.stderr
+++ b/tests/ui/issues/issue-23041.stderr
@@ -9,6 +9,6 @@ help: consider specifying the generic argument
 LL |     b.downcast_ref::<fn(_) -> _>();
    |                   ~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-23046.stderr b/tests/ui/issues/issue-23046.stderr
index 1403ecbd9..b6e238145 100644
--- a/tests/ui/issues/issue-23046.stderr
+++ b/tests/ui/issues/issue-23046.stderr
@@ -9,6 +9,6 @@ help: consider giving this closure parameter an explicit type, where the type fo
 LL |     let ex = |x: Expr<'_, VAR>| {
    |                +++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-23073.stderr b/tests/ui/issues/issue-23073.stderr
index 3a9f49ef1..6a61df8d4 100644
--- a/tests/ui/issues/issue-23073.stderr
+++ b/tests/ui/issues/issue-23073.stderr
@@ -9,6 +9,6 @@ help: if there were a trait named `Example` with associated type `T` implemented
 LL |     type FooT = <<Self as Bar>::Foo as Example>::T;
    |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0223`.
diff --git a/tests/ui/issues/issue-23122-1.stderr b/tests/ui/issues/issue-23122-1.stderr
index 0b568b30e..c432a502c 100644
--- a/tests/ui/issues/issue-23122-1.stderr
+++ b/tests/ui/issues/issue-23122-1.stderr
@@ -4,6 +4,6 @@ error[E0275]: overflow evaluating the requirement `<GetNext<T> as Next>::Next ==
 LL |     type Next = <GetNext<T> as Next>::Next;
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0275`.
diff --git a/tests/ui/issues/issue-23122-2.stderr b/tests/ui/issues/issue-23122-2.stderr
index af77e4b1a..b8aa587a7 100644
--- a/tests/ui/issues/issue-23122-2.stderr
+++ b/tests/ui/issues/issue-23122-2.stderr
@@ -13,6 +13,6 @@ LL | impl<T: Next> Next for GetNext<T> {
    |      |
    |      unsatisfied trait bound introduced here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0275`.
diff --git a/tests/ui/issues/issue-23189.stderr b/tests/ui/issues/issue-23189.stderr
index ed065212c..37d778dc9 100644
--- a/tests/ui/issues/issue-23189.stderr
+++ b/tests/ui/issues/issue-23189.stderr
@@ -4,6 +4,6 @@ error[E0574]: expected struct, variant or union type, found module `module`
 LL |     let _ = module { x: 0 };
    |             ^^^^^^ not a struct, variant or union type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0574`.
diff --git a/tests/ui/issues/issue-23217.stderr b/tests/ui/issues/issue-23217.stderr
index 5d3d8a4f8..05ee0474c 100644
--- a/tests/ui/issues/issue-23217.stderr
+++ b/tests/ui/issues/issue-23217.stderr
@@ -9,6 +9,6 @@ LL |     B = SomeEnum::A,
    |                   variant or associated item not found in `SomeEnum`
    |                   help: there is a variant with a similar name: `B`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-23253.stderr b/tests/ui/issues/issue-23253.stderr
index be5714cd9..ec7696909 100644
--- a/tests/ui/issues/issue-23253.stderr
+++ b/tests/ui/issues/issue-23253.stderr
@@ -2,8 +2,8 @@ error[E0609]: no field `a` on type `Foo`
   --> $DIR/issue-23253.rs:4:14
    |
 LL |     Foo::Bar.a;
-   |              ^
+   |              ^ unknown field
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-23281.stderr b/tests/ui/issues/issue-23281.stderr
index 804334c9b..e1f4e8a96 100644
--- a/tests/ui/issues/issue-23281.stderr
+++ b/tests/ui/issues/issue-23281.stderr
@@ -18,6 +18,6 @@ LL | struct Vec<T> {
 LL |     t: T,
    |        - ...if indirection were used here: `Box<T>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-23302-1.stderr b/tests/ui/issues/issue-23302-1.stderr
index d753bdeb9..5c2758dc6 100644
--- a/tests/ui/issues/issue-23302-1.stderr
+++ b/tests/ui/issues/issue-23302-1.stderr
@@ -17,6 +17,6 @@ LL |     A = X::A as isize,
    |         ^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-23302-2.stderr b/tests/ui/issues/issue-23302-2.stderr
index b756ee1d5..93665af69 100644
--- a/tests/ui/issues/issue-23302-2.stderr
+++ b/tests/ui/issues/issue-23302-2.stderr
@@ -17,6 +17,6 @@ LL |     A = Y::B as isize,
    |         ^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-23302-3.stderr b/tests/ui/issues/issue-23302-3.stderr
index 6cdc94551..b3e933a21 100644
--- a/tests/ui/issues/issue-23302-3.stderr
+++ b/tests/ui/issues/issue-23302-3.stderr
@@ -27,6 +27,6 @@ LL | const A: i32 = B;
    | ^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-23477.rs b/tests/ui/issues/issue-23477.rs
index 988ebe03c..1ce05ba39 100644
--- a/tests/ui/issues/issue-23477.rs
+++ b/tests/ui/issues/issue-23477.rs
@@ -1,5 +1,4 @@
 // build-pass
-// ignore-asmjs wasm2js does not support source maps yet
 // compile-flags: -g
 
 pub struct Dst {
diff --git a/tests/ui/issues/issue-23543.stderr b/tests/ui/issues/issue-23543.stderr
index ebb70afe3..d917a4c51 100644
--- a/tests/ui/issues/issue-23543.stderr
+++ b/tests/ui/issues/issue-23543.stderr
@@ -4,6 +4,6 @@ error[E0229]: associated type bindings are not allowed here
 LL |         where T<Bogus = Foo>: A;
    |                 ^^^^^^^^^^^ associated type not allowed here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0229`.
diff --git a/tests/ui/issues/issue-23544.stderr b/tests/ui/issues/issue-23544.stderr
index c912baccb..2a7e93f0e 100644
--- a/tests/ui/issues/issue-23544.stderr
+++ b/tests/ui/issues/issue-23544.stderr
@@ -4,6 +4,6 @@ error[E0229]: associated type bindings are not allowed here
 LL |         where T<Bogus = Self::AlsoBogus>: A;
    |                 ^^^^^^^^^^^^^^^^^^^^^^^ associated type not allowed here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0229`.
diff --git a/tests/ui/issues/issue-23966.stderr b/tests/ui/issues/issue-23966.stderr
index 542aed0eb..c29e88614 100644
--- a/tests/ui/issues/issue-23966.stderr
+++ b/tests/ui/issues/issue-23966.stderr
@@ -10,6 +10,6 @@ LL |     "".chars().fold(|_, _| (), ());
 note: required by a bound in `fold`
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-24013.stderr b/tests/ui/issues/issue-24013.stderr
index 72102f460..37a86ecc5 100644
--- a/tests/ui/issues/issue-24013.stderr
+++ b/tests/ui/issues/issue-24013.stderr
@@ -4,6 +4,6 @@ error[E0282]: type annotations needed
 LL |     unsafe {swap::<&mut _>(transmute(&a), transmute(&b))};
    |             ^^^^^^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `swap`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-24322.stderr b/tests/ui/issues/issue-24322.stderr
index 954fd4928..d078069ad 100644
--- a/tests/ui/issues/issue-24322.stderr
+++ b/tests/ui/issues/issue-24322.stderr
@@ -6,9 +6,9 @@ LL |     let x: &fn(&B) -> u32 = &B::func;
    |            |
    |            expected due to this
    |
-   = note: expected reference `&for<'a> fn(&'a B) -> u32`
-              found reference `&for<'a> fn(&'a B) -> u32 {B::func}`
+   = note: expected reference `&for<'a> fn(&'a B) -> _`
+              found reference `&for<'a> fn(&'a B) -> _ {B::func}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-24352.stderr b/tests/ui/issues/issue-24352.stderr
index f1c3891b8..015569cce 100644
--- a/tests/ui/issues/issue-24352.stderr
+++ b/tests/ui/issues/issue-24352.stderr
@@ -15,6 +15,6 @@ help: consider using a floating-point literal by writing it with `.0`
 LL |     1.0f64 - 1.0
    |               ++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-24357.stderr b/tests/ui/issues/issue-24357.stderr
index b9e15f5e2..08a5a8ac5 100644
--- a/tests/ui/issues/issue-24357.stderr
+++ b/tests/ui/issues/issue-24357.stderr
@@ -12,6 +12,6 @@ LL |    let f = move || { let y = x; };
 LL |    let z = x;
    |            ^ value used here after move
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-24365.stderr b/tests/ui/issues/issue-24365.stderr
index f9eead8a4..3f6ed0231 100644
--- a/tests/ui/issues/issue-24365.stderr
+++ b/tests/ui/issues/issue-24365.stderr
@@ -2,19 +2,19 @@ error[E0609]: no field `b` on type `Foo`
   --> $DIR/issue-24365.rs:10:22
    |
 LL |     println!("{}", a.b);
-   |                      ^
+   |                      ^ unknown field
 
 error[E0609]: no field `attr_name_idx` on type `&Attribute`
   --> $DIR/issue-24365.rs:17:18
    |
 LL |     let z = (&x).attr_name_idx;
-   |                  ^^^^^^^^^^^^^
+   |                  ^^^^^^^^^^^^^ unknown field
 
 error[E0609]: no field `attr_name_idx` on type `Attribute`
   --> $DIR/issue-24365.rs:18:15
    |
 LL |     let y = x.attr_name_idx;
-   |               ^^^^^^^^^^^^^
+   |               ^^^^^^^^^^^^^ unknown field
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/issues/issue-24424.stderr b/tests/ui/issues/issue-24424.stderr
index 50d7f988e..d42750e7a 100644
--- a/tests/ui/issues/issue-24424.stderr
+++ b/tests/ui/issues/issue-24424.stderr
@@ -10,6 +10,6 @@ note: multiple `impl`s or `where` clauses satisfying `T0: Trait0<'l0>` found
 LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}
    |                                                         ^^^^^^^^^^^       ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0283`.
diff --git a/tests/ui/issues/issue-24687-embed-debuginfo/main.rs b/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
index f08bcdfe6..773792c7a 100644
--- a/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
+++ b/tests/ui/issues/issue-24687-embed-debuginfo/main.rs
@@ -1,7 +1,6 @@
 // run-pass
 // aux-build:issue-24687-lib.rs
 // compile-flags:-g
-// ignore-asmjs wasm2js does not support source maps yet
 
 extern crate issue_24687_lib as d;
 
diff --git a/tests/ui/issues/issue-24819.stderr b/tests/ui/issues/issue-24819.stderr
index 8b4f1dbce..8ec34aa13 100644
--- a/tests/ui/issues/issue-24819.stderr
+++ b/tests/ui/issues/issue-24819.stderr
@@ -14,6 +14,6 @@ note: function defined here
 LL | fn foo(h: &mut HashSet<u32>) {
    |    ^^^ --------------------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-24945-repeat-dash-opts.rs b/tests/ui/issues/issue-24945-repeat-dash-opts.rs
index 0f92fc2f7..cf3834952 100644
--- a/tests/ui/issues/issue-24945-repeat-dash-opts.rs
+++ b/tests/ui/issues/issue-24945-repeat-dash-opts.rs
@@ -3,7 +3,6 @@
 // as options to the compiler.
 
 // compile-flags:-g -g -O -O
-// ignore-asmjs wasm2js does not support source maps yet
 
 fn main() {
     assert_eq!(1, 1);
diff --git a/tests/ui/issues/issue-25076.stderr b/tests/ui/issues/issue-25076.stderr
index 065bf7def..2acfe70b4 100644
--- a/tests/ui/issues/issue-25076.stderr
+++ b/tests/ui/issues/issue-25076.stderr
@@ -17,6 +17,6 @@ note: required by a bound in `do_fold`
 LL | fn do_fold<B, F: InOut<B, Out=B>>(init: B, f: F) {}
    |                  ^^^^^^^^^^^^^^^ required by this bound in `do_fold`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-25368.stderr b/tests/ui/issues/issue-25368.stderr
index e6ed3aac7..23f1441e6 100644
--- a/tests/ui/issues/issue-25368.stderr
+++ b/tests/ui/issues/issue-25368.stderr
@@ -9,6 +9,6 @@ help: consider specifying the generic argument
 LL |         tx.send(Foo{ foo: PhantomData::<T> });
    |                                      +++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-25386.stderr b/tests/ui/issues/issue-25386.stderr
index 727b96908..720b77866 100644
--- a/tests/ui/issues/issue-25386.stderr
+++ b/tests/ui/issues/issue-25386.stderr
@@ -9,6 +9,6 @@ LL |     println!("{}", check_ptr_exist!(item, name));
    |
    = note: this error originates in the macro `check_ptr_exist` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0616`.
diff --git a/tests/ui/issues/issue-2590.stderr b/tests/ui/issues/issue-2590.stderr
index 6aacd563a..517b4814e 100644
--- a/tests/ui/issues/issue-2590.stderr
+++ b/tests/ui/issues/issue-2590.stderr
@@ -4,6 +4,6 @@ error[E0507]: cannot move out of `self.tokens` which is behind a shared referenc
 LL |         self.tokens
    |         ^^^^^^^^^^^ move occurs because `self.tokens` has type `Vec<isize>`, which does not implement the `Copy` trait
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/issues/issue-25901.stderr b/tests/ui/issues/issue-25901.stderr
index 1427e4385..673f29fff 100644
--- a/tests/ui/issues/issue-25901.stderr
+++ b/tests/ui/issues/issue-25901.stderr
@@ -19,6 +19,6 @@ LL | impl Deref for A {
    = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
    = note: consider wrapping this expression in `Lazy::new(|| ...)` from the `once_cell` crate: https://crates.io/crates/once_cell
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0015`.
diff --git a/tests/ui/issues/issue-26056.stderr b/tests/ui/issues/issue-26056.stderr
index 2c873243f..f1f553adf 100644
--- a/tests/ui/issues/issue-26056.stderr
+++ b/tests/ui/issues/issue-26056.stderr
@@ -12,6 +12,6 @@ LL | trait Map: MapLookup<<Self as Map>::Key> {
    |       |
    |       this trait cannot be made into an object...
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0038`.
diff --git a/tests/ui/issues/issue-26217.stderr b/tests/ui/issues/issue-26217.stderr
index 73c772205..0b153ad74 100644
--- a/tests/ui/issues/issue-26217.stderr
+++ b/tests/ui/issues/issue-26217.stderr
@@ -12,5 +12,5 @@ note: due to current limitations in the borrow checker, this implies a `'static`
 LL | fn foo<T>() where for<'a> T: 'a {}
    |                              ^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-26237.stderr b/tests/ui/issues/issue-26237.stderr
index 91d28a5e1..d15e5753a 100644
--- a/tests/ui/issues/issue-26237.stderr
+++ b/tests/ui/issues/issue-26237.stderr
@@ -10,6 +10,6 @@ LL |     let mut value_b = 0;
 LL |     macro_panic!(value_a, value_b);
    |                  ^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-26484.rs b/tests/ui/issues/issue-26484.rs
index 2a8750d3e..3b40b3dd8 100644
--- a/tests/ui/issues/issue-26484.rs
+++ b/tests/ui/issues/issue-26484.rs
@@ -1,6 +1,5 @@
 // run-pass
 // compile-flags:-g
-// ignore-asmjs wasm2js does not support source maps yet
 
 fn helper<F: FnOnce(usize) -> bool>(_f: F) {
     print!("");
diff --git a/tests/ui/issues/issue-26619.stderr b/tests/ui/issues/issue-26619.stderr
index 1282fd7d3..9175bd2a3 100644
--- a/tests/ui/issues/issue-26619.stderr
+++ b/tests/ui/issues/issue-26619.stderr
@@ -6,6 +6,6 @@ LL |         for s in vec!["1|2".to_string()].into_iter().filter_map(|ref line|
    |                                                                  |
    |                                                                  function parameter borrowed here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0515`.
diff --git a/tests/ui/issues/issue-26812.stderr b/tests/ui/issues/issue-26812.stderr
index fd1bbb9c5..c2a3d4b83 100644
--- a/tests/ui/issues/issue-26812.stderr
+++ b/tests/ui/issues/issue-26812.stderr
@@ -4,6 +4,6 @@ error[E0128]: generic parameters with a default cannot use forward declared iden
 LL | fn avg<T=T::Item>(_: T) {}
    |          ^^^^^^^ defaulted generic parameters cannot be forward declared
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0128`.
diff --git a/tests/ui/issues/issue-26905.stderr b/tests/ui/issues/issue-26905.stderr
index 10dbb7325..86f6a14cd 100644
--- a/tests/ui/issues/issue-26905.stderr
+++ b/tests/ui/issues/issue-26905.stderr
@@ -7,6 +7,6 @@ LL | impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<MyRc<U>> for MyRc<T>{
    = note: `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced
    = note: currently, 2 fields need coercions: `_ptr` (`*const T` to `*const U`), `_boo` (`NotPhantomData<T>` to `NotPhantomData<U>`)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0375`.
diff --git a/tests/ui/issues/issue-26948.stderr b/tests/ui/issues/issue-26948.stderr
index faede1687..982c9758a 100644
--- a/tests/ui/issues/issue-26948.stderr
+++ b/tests/ui/issues/issue-26948.stderr
@@ -4,6 +4,6 @@ error[E0436]: functional record update syntax requires a struct
 LL |     Foo::A { x: 6, ..orig };
    |                      ^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0436`.
diff --git a/tests/ui/issues/issue-27008.stderr b/tests/ui/issues/issue-27008.stderr
index 9d18045aa..b4bfaa278 100644
--- a/tests/ui/issues/issue-27008.stderr
+++ b/tests/ui/issues/issue-27008.stderr
@@ -4,6 +4,6 @@ error[E0308]: mismatched types
 LL |     let b = [0; S];
    |                 ^ expected `usize`, found `S`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-27078.stderr b/tests/ui/issues/issue-27078.stderr
index ced92bbd4..d0ba9f6ae 100644
--- a/tests/ui/issues/issue-27078.stderr
+++ b/tests/ui/issues/issue-27078.stderr
@@ -14,6 +14,6 @@ help: function arguments must have a statically known size, borrowed types alway
 LL |     fn foo(&self) -> &'static i32 {
    |            +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-27340.stderr b/tests/ui/issues/issue-27340.stderr
index 9caaffd9c..3353b83f4 100644
--- a/tests/ui/issues/issue-27340.stderr
+++ b/tests/ui/issues/issue-27340.stderr
@@ -9,6 +9,6 @@ LL | struct Bar(Foo);
    |
    = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0204`.
diff --git a/tests/ui/issues/issue-27433.stderr b/tests/ui/issues/issue-27433.stderr
index da751a649..aba8e6128 100644
--- a/tests/ui/issues/issue-27433.stderr
+++ b/tests/ui/issues/issue-27433.stderr
@@ -6,6 +6,6 @@ LL |     const FOO : u32 = foo;
    |     |
    |     help: consider using `let` instead of `const`: `let FOO`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0435`.
diff --git a/tests/ui/issues/issue-2823.stderr b/tests/ui/issues/issue-2823.stderr
index b5a2b2f55..5cd3f0804 100644
--- a/tests/ui/issues/issue-2823.stderr
+++ b/tests/ui/issues/issue-2823.stderr
@@ -11,6 +11,6 @@ LL |     let _d = c.clone();
    = note: the following trait defines an item `clone`, perhaps you need to implement it:
            candidate #1: `Clone`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-2848.stderr b/tests/ui/issues/issue-2848.stderr
index 71ed7d70b..873f7efcd 100644
--- a/tests/ui/issues/issue-2848.stderr
+++ b/tests/ui/issues/issue-2848.stderr
@@ -6,6 +6,6 @@ LL |       alpha | beta => {}
    |       |
    |       pattern doesn't bind `beta`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0408`.
diff --git a/tests/ui/issues/issue-2849.stderr b/tests/ui/issues/issue-2849.stderr
index 9027098d2..ef5cdb42e 100644
--- a/tests/ui/issues/issue-2849.stderr
+++ b/tests/ui/issues/issue-2849.stderr
@@ -6,6 +6,6 @@ LL |       Foo::Alpha | Foo::Beta(i) => {}
    |       |
    |       pattern doesn't bind `i`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0408`.
diff --git a/tests/ui/issues/issue-28568.stderr b/tests/ui/issues/issue-28568.stderr
index 960259080..c8db0403e 100644
--- a/tests/ui/issues/issue-28568.stderr
+++ b/tests/ui/issues/issue-28568.stderr
@@ -7,6 +7,6 @@ LL | impl Drop for MyStruct {
 LL | impl Drop for MyStruct {
    | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `MyStruct`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0119`.
diff --git a/tests/ui/issues/issue-28586.stderr b/tests/ui/issues/issue-28586.stderr
index d19c4af2d..33f40a341 100644
--- a/tests/ui/issues/issue-28586.stderr
+++ b/tests/ui/issues/issue-28586.stderr
@@ -4,6 +4,6 @@ error[E0599]: no associated item named `BYTES` found for type `usize` in the cur
 LL | impl Foo for [u8; usize::BYTES] {}
    |                          ^^^^^ associated item not found in `usize`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-28625.stderr b/tests/ui/issues/issue-28625.stderr
index 7ee0cd486..3600622a4 100644
--- a/tests/ui/issues/issue-28625.stderr
+++ b/tests/ui/issues/issue-28625.stderr
@@ -7,6 +7,6 @@ LL |     unsafe { std::mem::transmute(a) }
    = note: source type: `&ArrayPeano<T>` (N bits)
    = note: target type: `&[T]` (N bits)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0512`.
diff --git a/tests/ui/issues/issue-28776.mir.stderr b/tests/ui/issues/issue-28776.mir.stderr
index 1d470fb5e..e7b7ba082 100644
--- a/tests/ui/issues/issue-28776.mir.stderr
+++ b/tests/ui/issues/issue-28776.mir.stderr
@@ -6,6 +6,6 @@ LL |     (&ptr::write)(1 as *mut _, 42);
    |
    = note: consult the function's documentation for information on how to avoid undefined behavior
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/issues/issue-28776.thir.stderr b/tests/ui/issues/issue-28776.thir.stderr
index e3562810b..63172b854 100644
--- a/tests/ui/issues/issue-28776.thir.stderr
+++ b/tests/ui/issues/issue-28776.thir.stderr
@@ -6,6 +6,6 @@ LL |     (&ptr::write)(1 as *mut _, 42);
    |
    = note: consult the function's documentation for information on how to avoid undefined behavior
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/issues/issue-28971.stderr b/tests/ui/issues/issue-28971.stderr
index 2eb8a1c26..8fd3c7ffc 100644
--- a/tests/ui/issues/issue-28971.stderr
+++ b/tests/ui/issues/issue-28971.stderr
@@ -10,6 +10,6 @@ LL |             Foo::Baz(..) => (),
    |                  variant or associated item not found in `Foo`
    |                  help: there is a variant with a similar name: `Bar`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-29147.stderr b/tests/ui/issues/issue-29147.stderr
index d0d948531..a9cda55fd 100644
--- a/tests/ui/issues/issue-29147.stderr
+++ b/tests/ui/issues/issue-29147.stderr
@@ -12,6 +12,6 @@ LL | impl Foo for S5<u32> { fn xxx(&self) {} }
 LL | impl Foo for S5<u64> { fn xxx(&self) {} }
    | ^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0283`.
diff --git a/tests/ui/issues/issue-2951.stderr b/tests/ui/issues/issue-2951.stderr
index 538bbe2f5..134808b4d 100644
--- a/tests/ui/issues/issue-2951.stderr
+++ b/tests/ui/issues/issue-2951.stderr
@@ -15,6 +15,6 @@ LL |     xx = y;
    = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-29861.stderr b/tests/ui/issues/issue-29861.stderr
index d9d3cf360..e7860c19e 100644
--- a/tests/ui/issues/issue-29861.stderr
+++ b/tests/ui/issues/issue-29861.stderr
@@ -4,6 +4,6 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait,
 LL | impl<'a, T: 'a> MakeRef2 for T {
    |      ^^ unconstrained lifetime parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0207`.
diff --git a/tests/ui/issues/issue-2995.stderr b/tests/ui/issues/issue-2995.stderr
index 0d09612c6..f4a08e175 100644
--- a/tests/ui/issues/issue-2995.stderr
+++ b/tests/ui/issues/issue-2995.stderr
@@ -10,6 +10,6 @@ LL -     let _q: &isize = p as &isize;
 LL +     let _q: &isize = &*p;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0605`.
diff --git a/tests/ui/issues/issue-30007.stderr b/tests/ui/issues/issue-30007.stderr
index 87e770e15..f303221cf 100644
--- a/tests/ui/issues/issue-30007.stderr
+++ b/tests/ui/issues/issue-30007.stderr
@@ -9,5 +9,5 @@ LL |     let i: Vec<t!()>;
    |
    = note: the usage of `t!` is likely invalid in type context
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-30123.stderr b/tests/ui/issues/issue-30123.stderr
index a00a1dbb8..cf71a01b5 100644
--- a/tests/ui/issues/issue-30123.stderr
+++ b/tests/ui/issues/issue-30123.stderr
@@ -7,6 +7,6 @@ LL |     let ug = Graph::<i32, i32>::new_undirected();
    = note: the function or associated item was found for
            - `issue_30123_aux::Graph<N, E, Undirected>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-3021-b.stderr b/tests/ui/issues/issue-3021-b.stderr
index 72289c5f9..48777fec0 100644
--- a/tests/ui/issues/issue-3021-b.stderr
+++ b/tests/ui/issues/issue-3021-b.stderr
@@ -6,6 +6,6 @@ LL |            self.v0 = k0 ^ 0x736f6d6570736575;
    |
    = help: use the `|| { ... }` closure form instead
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0434`.
diff --git a/tests/ui/issues/issue-30236.stderr b/tests/ui/issues/issue-30236.stderr
index 64cbd58d6..0f69f49f5 100644
--- a/tests/ui/issues/issue-30236.stderr
+++ b/tests/ui/issues/issue-30236.stderr
@@ -4,6 +4,6 @@ error[E0091]: type parameter `Unused` is unused
 LL |     Unused
    |     ^^^^^^ unused type parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0091`.
diff --git a/tests/ui/issues/issue-30589.stderr b/tests/ui/issues/issue-30589.stderr
index 4b88547a1..6f97a189c 100644
--- a/tests/ui/issues/issue-30589.stderr
+++ b/tests/ui/issues/issue-30589.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `DecoderError` in this scope
 LL | impl fmt::Display for DecoderError {
    |                       ^^^^^^^^^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-31011.stderr b/tests/ui/issues/issue-31011.stderr
index 58c170409..9785d56f4 100644
--- a/tests/ui/issues/issue-31011.stderr
+++ b/tests/ui/issues/issue-31011.stderr
@@ -2,7 +2,7 @@ error[E0609]: no field `trace` on type `&T`
   --> $DIR/issue-31011.rs:3:17
    |
 LL |         if $ctx.trace {
-   |                 ^^^^^
+   |                 ^^^^^ unknown field
 ...
 LL | fn wrap<T>(context: &T) -> ()
    |         - type parameter 'T' declared here
@@ -12,6 +12,6 @@ LL |     log!(context, "entered wrapper");
    |
    = note: this error originates in the macro `log` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0609`.
diff --git a/tests/ui/issues/issue-31511.stderr b/tests/ui/issues/issue-31511.stderr
index cb2991809..177b78754 100644
--- a/tests/ui/issues/issue-31511.stderr
+++ b/tests/ui/issues/issue-31511.stderr
@@ -4,6 +4,6 @@ error[E0607]: cannot cast thin pointer `*const ()` to fat pointer `*const [u8]`
 LL |     x as *const [u8];
    |     ^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0607`.
diff --git a/tests/ui/issues/issue-3154.stderr b/tests/ui/issues/issue-3154.stderr
index da2af83ff..3106aaddc 100644
--- a/tests/ui/issues/issue-3154.stderr
+++ b/tests/ui/issues/issue-3154.stderr
@@ -6,6 +6,6 @@ LL | fn thing<'a,Q>(x: &Q) -> Thing<'a,Q> {
 LL |     Thing { x: x }
    |     ^^^^^^^^^^^^^^ lifetime `'a` required
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0621`.
diff --git a/tests/ui/issues/issue-31910.stderr b/tests/ui/issues/issue-31910.stderr
index 2603c9442..6ef84d7da 100644
--- a/tests/ui/issues/issue-31910.stderr
+++ b/tests/ui/issues/issue-31910.stderr
@@ -4,6 +4,6 @@ error[E0308]: mismatched types
 LL |     X = Trait::Number,
    |         ^^^^^^^^^^^^^ expected `isize`, found `i32`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-32122-1.stderr b/tests/ui/issues/issue-32122-1.stderr
index b4f5b1296..ae5dffe1f 100644
--- a/tests/ui/issues/issue-32122-1.stderr
+++ b/tests/ui/issues/issue-32122-1.stderr
@@ -13,6 +13,6 @@ help: consider dereferencing
 LL |     let _: *const u8 = &*a;
    |                         +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-32122-2.stderr b/tests/ui/issues/issue-32122-2.stderr
index 02c335c15..eb4327bef 100644
--- a/tests/ui/issues/issue-32122-2.stderr
+++ b/tests/ui/issues/issue-32122-2.stderr
@@ -13,6 +13,6 @@ help: consider dereferencing
 LL |     let _: *const u8 = &***a;
    |                         +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-32326.stderr b/tests/ui/issues/issue-32326.stderr
index dc51198d9..1989a915c 100644
--- a/tests/ui/issues/issue-32326.stderr
+++ b/tests/ui/issues/issue-32326.stderr
@@ -11,6 +11,6 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
 LL |     Plus(Box<Expr>, Expr),
    |          ++++    +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0072`.
diff --git a/tests/ui/issues/issue-32377.stderr b/tests/ui/issues/issue-32377.stderr
index 5e870eb3e..01a81cea1 100644
--- a/tests/ui/issues/issue-32377.stderr
+++ b/tests/ui/issues/issue-32377.stderr
@@ -7,6 +7,6 @@ LL |     unsafe { mem::transmute(x) }
    = note: source type: `[usize; 2]` (N bits)
    = note: target type: `Bar<U>` (N bits)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0512`.
diff --git a/tests/ui/issues/issue-32782.stderr b/tests/ui/issues/issue-32782.stderr
index a6c55ba03..477c01f68 100644
--- a/tests/ui/issues/issue-32782.stderr
+++ b/tests/ui/issues/issue-32782.stderr
@@ -10,6 +10,6 @@ LL | foo!();
    = help: add `#![feature(allow_internal_unstable)]` to the crate attributes to enable
    = note: this error originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/issues/issue-33096.rs b/tests/ui/issues/issue-33096.rs
index 2501e1430..f0b472e2f 100644
--- a/tests/ui/issues/issue-33096.rs
+++ b/tests/ui/issues/issue-33096.rs
@@ -1,6 +1,5 @@
 // run-pass
 // compile-flags: -g
-// ignore-asmjs wasm2js does not support source maps yet
 
 use std::ops::Deref;
 
diff --git a/tests/ui/issues/issue-33293.stderr b/tests/ui/issues/issue-33293.stderr
index c8450f400..5badaa153 100644
--- a/tests/ui/issues/issue-33293.stderr
+++ b/tests/ui/issues/issue-33293.stderr
@@ -4,6 +4,6 @@ error[E0433]: failed to resolve: use of undeclared crate or module `aaa`
 LL |         aaa::bbb(_) => ()
    |         ^^^ use of undeclared crate or module `aaa`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0433`.
diff --git a/tests/ui/issues/issue-3344.stderr b/tests/ui/issues/issue-3344.stderr
index e849f5d04..eac8f10fc 100644
--- a/tests/ui/issues/issue-3344.stderr
+++ b/tests/ui/issues/issue-3344.stderr
@@ -6,6 +6,6 @@ LL | impl PartialOrd for Thing {
    |
    = help: implement the missing item: `fn partial_cmp(&self, _: &Thing) -> Option<std::cmp::Ordering> { todo!() }`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0046`.
diff --git a/tests/ui/issues/issue-33504.stderr b/tests/ui/issues/issue-33504.stderr
index a831cf585..f3e1ca08b 100644
--- a/tests/ui/issues/issue-33504.stderr
+++ b/tests/ui/issues/issue-33504.stderr
@@ -11,6 +11,6 @@ LL |         let Test = 1;
    |             `Test` is interpreted as a unit struct, not a new binding
    |             help: introduce a new binding instead: `other_test`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-33525.stderr b/tests/ui/issues/issue-33525.stderr
index f8d703dc3..ee9f4d4c3 100644
--- a/tests/ui/issues/issue-33525.stderr
+++ b/tests/ui/issues/issue-33525.stderr
@@ -8,13 +8,13 @@ error[E0609]: no field `lorem` on type `&'static str`
   --> $DIR/issue-33525.rs:3:8
    |
 LL |     "".lorem;
-   |        ^^^^^
+   |        ^^^^^ unknown field
 
 error[E0609]: no field `ipsum` on type `&'static str`
   --> $DIR/issue-33525.rs:4:8
    |
 LL |     "".ipsum;
-   |        ^^^^^
+   |        ^^^^^ unknown field
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/issues/issue-34047.stderr b/tests/ui/issues/issue-34047.stderr
index f770ded50..97b1230ce 100644
--- a/tests/ui/issues/issue-34047.stderr
+++ b/tests/ui/issues/issue-34047.stderr
@@ -7,6 +7,6 @@ LL | const C: u8 = 0;
 LL |         mut C => {}
    |             ^ cannot be named the same as a constant
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0530`.
diff --git a/tests/ui/issues/issue-34209.stderr b/tests/ui/issues/issue-34209.stderr
index f9a25b69f..41bc60d03 100644
--- a/tests/ui/issues/issue-34209.stderr
+++ b/tests/ui/issues/issue-34209.stderr
@@ -7,6 +7,6 @@ LL | enum S {
 LL |         S::B {} => {},
    |            ^ help: there is a variant with a similar name: `A`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-34229.stderr b/tests/ui/issues/issue-34229.stderr
index 69ef876d2..e6aa0d259 100644
--- a/tests/ui/issues/issue-34229.stderr
+++ b/tests/ui/issues/issue-34229.stderr
@@ -13,6 +13,6 @@ help: consider annotating `Comparable` with `#[derive(PartialOrd)]`
 LL | #[derive(PartialEq)] #[derive(PartialOrd)]
    |                      +++++++++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-34334.stderr b/tests/ui/issues/issue-34334.stderr
index 753942dd1..ac2e63eca 100644
--- a/tests/ui/issues/issue-34334.stderr
+++ b/tests/ui/issues/issue-34334.stderr
@@ -2,9 +2,8 @@ error: expected one of `,`, `:`, or `>`, found `=`
   --> $DIR/issue-34334.rs:2:29
    |
 LL |     let sr: Vec<(u32, _, _) = vec![];
-   |         --                - ^ expected one of `,`, `:`, or `>`
-   |         |                 |
-   |         |                 maybe try to close unmatched angle bracket
+   |         --                  ^ expected one of `,`, `:`, or `>`
+   |         |
    |         while parsing the type for `sr`
    |
 help: you might have meant to end the type parameters here
diff --git a/tests/ui/issues/issue-34349.stderr b/tests/ui/issues/issue-34349.stderr
index 8e9a16619..6a6188f10 100644
--- a/tests/ui/issues/issue-34349.stderr
+++ b/tests/ui/issues/issue-34349.stderr
@@ -17,6 +17,6 @@ note: required by a bound in `apply`
 LL |     fn apply<F>(f: F) where F: Fn() {
    |                                ^^^^ required by this bound in `apply`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0525`.
diff --git a/tests/ui/issues/issue-34373.stderr b/tests/ui/issues/issue-34373.stderr
index 0f0821518..c6906734b 100644
--- a/tests/ui/issues/issue-34373.stderr
+++ b/tests/ui/issues/issue-34373.stderr
@@ -23,6 +23,6 @@ LL | | }
    | |_^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0391`.
diff --git a/tests/ui/issues/issue-34569.rs b/tests/ui/issues/issue-34569.rs
index 88dcdd411..1f6856050 100644
--- a/tests/ui/issues/issue-34569.rs
+++ b/tests/ui/issues/issue-34569.rs
@@ -1,6 +1,5 @@
 // run-pass
 // compile-flags:-g
-// ignore-asmjs wasm2js does not support source maps yet
 
 // In this test we just want to make sure that the code below does not lead to
 // a debuginfo verification assertion during compilation. This was caused by the
diff --git a/tests/ui/issues/issue-3477.stderr b/tests/ui/issues/issue-3477.stderr
index fd5f7dcf6..2a4d6d244 100644
--- a/tests/ui/issues/issue-3477.stderr
+++ b/tests/ui/issues/issue-3477.stderr
@@ -6,6 +6,6 @@ LL |     let _p: char = 100;
    |             |
    |             expected due to this
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-35139.stderr b/tests/ui/issues/issue-35139.stderr
index 79e889b7e..875af7048 100644
--- a/tests/ui/issues/issue-35139.stderr
+++ b/tests/ui/issues/issue-35139.stderr
@@ -4,6 +4,6 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait,
 LL | impl<'a> MethodType for MTFn {
    |      ^^ unconstrained lifetime parameter
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0207`.
diff --git a/tests/ui/issues/issue-3521-2.stderr b/tests/ui/issues/issue-3521-2.stderr
index 84c7a9efa..0be0e93c1 100644
--- a/tests/ui/issues/issue-3521-2.stderr
+++ b/tests/ui/issues/issue-3521-2.stderr
@@ -6,6 +6,6 @@ LL |     static y: isize = foo + 1;
    |     |
    |     help: consider using `let` instead of `static`: `let y`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0435`.
diff --git a/tests/ui/issues/issue-35241.stderr b/tests/ui/issues/issue-35241.stderr
index 4a2c15511..6f6602793 100644
--- a/tests/ui/issues/issue-35241.stderr
+++ b/tests/ui/issues/issue-35241.stderr
@@ -16,6 +16,6 @@ help: use parentheses to construct this tuple struct
 LL | fn test() -> Foo { Foo(/* u32 */) }
    |                       +++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-35570.stderr b/tests/ui/issues/issue-35570.stderr
index 197e80ac0..f23b55689 100644
--- a/tests/ui/issues/issue-35570.stderr
+++ b/tests/ui/issues/issue-35570.stderr
@@ -10,6 +10,6 @@ help: this trait has no implementations, consider adding one
 LL | trait Trait2<'a> {
    | ^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-35976.unimported.stderr b/tests/ui/issues/issue-35976.unimported.stderr
index b31d2a315..169e3d05d 100644
--- a/tests/ui/issues/issue-35976.unimported.stderr
+++ b/tests/ui/issues/issue-35976.unimported.stderr
@@ -12,5 +12,5 @@ help: another candidate was found in the following trait, perhaps add a `use` fo
 LL + use private::Future;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-35988.stderr b/tests/ui/issues/issue-35988.stderr
index 55988844c..4a674b010 100644
--- a/tests/ui/issues/issue-35988.stderr
+++ b/tests/ui/issues/issue-35988.stderr
@@ -16,6 +16,6 @@ help: the `Box` type always has a statically known size and allocates its conten
 LL |     V(Box<[Box<E>]>),
    |       ++++        +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-36400.stderr b/tests/ui/issues/issue-36400.stderr
index 5b753c69d..522fb36e1 100644
--- a/tests/ui/issues/issue-36400.stderr
+++ b/tests/ui/issues/issue-36400.stderr
@@ -9,6 +9,6 @@ help: consider changing this to be mutable
 LL |     let mut x = Box::new(3);
    |         +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0596`.
diff --git a/tests/ui/issues/issue-3668-2.stderr b/tests/ui/issues/issue-3668-2.stderr
index ba9651041..3676f3888 100644
--- a/tests/ui/issues/issue-3668-2.stderr
+++ b/tests/ui/issues/issue-3668-2.stderr
@@ -6,6 +6,6 @@ LL |     static child: isize = x + 1;
    |     |
    |     help: consider using `let` instead of `static`: `let child`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0435`.
diff --git a/tests/ui/issues/issue-3668.stderr b/tests/ui/issues/issue-3668.stderr
index edc49979c..d761b2d87 100644
--- a/tests/ui/issues/issue-3668.stderr
+++ b/tests/ui/issues/issue-3668.stderr
@@ -6,6 +6,6 @@ LL |        static childVal: Box<P> = self.child.get();
    |        |
    |        help: consider using `let` instead of `static`: `let childVal`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0435`.
diff --git a/tests/ui/issues/issue-3680.stderr b/tests/ui/issues/issue-3680.stderr
index 0b0ae419e..2a757b44d 100644
--- a/tests/ui/issues/issue-3680.stderr
+++ b/tests/ui/issues/issue-3680.stderr
@@ -13,6 +13,6 @@ help: try wrapping the pattern in `Some`
 LL |         Some(Err(_)) => ()
    |         +++++      +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-36836.stderr b/tests/ui/issues/issue-36836.stderr
index 418194fac..e5c943c7c 100644
--- a/tests/ui/issues/issue-36836.stderr
+++ b/tests/ui/issues/issue-36836.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `Bar` in this scope
 LL | impl<T> Foo for Bar<T> {}
    |                 ^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-36856.rs b/tests/ui/issues/issue-36856.rs
index 5657ba69f..f2dfaf3dd 100644
--- a/tests/ui/issues/issue-36856.rs
+++ b/tests/ui/issues/issue-36856.rs
@@ -2,7 +2,6 @@
 // Regression test for #36856.
 
 // compile-flags:-g
-// ignore-asmjs wasm2js does not support source maps yet
 
 fn g() -> bool {
     false
diff --git a/tests/ui/issues/issue-3702-2.stderr b/tests/ui/issues/issue-3702-2.stderr
index 0b94c3135..4edca796f 100644
--- a/tests/ui/issues/issue-3702-2.stderr
+++ b/tests/ui/issues/issue-3702-2.stderr
@@ -23,6 +23,6 @@ help: disambiguate the method for candidate #2
 LL |         Add::to_int(&self) + other.to_int()
    |         ~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0034`.
diff --git a/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
index 3a1c0b82c..08b4573dd 100644
--- a/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
+++ b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.polonius.stderr
@@ -11,5 +11,5 @@ LL |     fn recurse(&self) {
    |     ^^^^^^^^^^^^^^^^^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-37311-type-length-limit/issue-37311.polonius/issue-37311.long-type.txt'
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
index 87832dd29..ccee9ed4d 100644
--- a/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
+++ b/tests/ui/issues/issue-37311-type-length-limit/issue-37311.stderr
@@ -11,5 +11,5 @@ LL |     fn recurse(&self) {
    |     ^^^^^^^^^^^^^^^^^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-37311-type-length-limit/issue-37311/issue-37311.long-type.txt'
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-37665.stderr b/tests/ui/issues/issue-37665.stderr
index 1e1f451b4..2c404b4e7 100644
--- a/tests/ui/issues/issue-37665.stderr
+++ b/tests/ui/issues/issue-37665.stderr
@@ -6,6 +6,6 @@ LL |     let x: () = 0;
    |            |
    |            expected due to this
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-3779.stderr b/tests/ui/issues/issue-3779.stderr
index a0dbcc920..d4f4b7910 100644
--- a/tests/ui/issues/issue-3779.stderr
+++ b/tests/ui/issues/issue-3779.stderr
@@ -12,6 +12,6 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
 LL |     element: Option<Box<S>>
    |                     ++++ +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0072`.
diff --git a/tests/ui/issues/issue-37884.stderr b/tests/ui/issues/issue-37884.stderr
index 7ddb36c8e..b7c0095d6 100644
--- a/tests/ui/issues/issue-37884.stderr
+++ b/tests/ui/issues/issue-37884.stderr
@@ -4,8 +4,8 @@ error[E0308]: method not compatible with trait
 LL |     fn next(&'a mut self) -> Option<Self::Item>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected signature `fn(&mut RepeatMut<'a, T>) -> Option<_>`
-              found signature `fn(&'a mut RepeatMut<'a, T>) -> Option<_>`
+   = note: expected signature `fn(&mut RepeatMut<'_, _>) -> Option<_>`
+              found signature `fn(&'a mut RepeatMut<'_, _>) -> Option<_>`
 note: the anonymous lifetime as defined here...
   --> $DIR/issue-37884.rs:6:5
    |
@@ -17,6 +17,6 @@ note: ...does not necessarily outlive the lifetime `'a` as defined here
 LL | impl<'a, T: 'a> Iterator for RepeatMut<'a, T> {
    |      ^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-38412.stderr b/tests/ui/issues/issue-38412.stderr
index 610696f84..ed8b6b60a 100644
--- a/tests/ui/issues/issue-38412.stderr
+++ b/tests/ui/issues/issue-38412.stderr
@@ -4,6 +4,6 @@ error[E0532]: cannot match against a tuple struct which contains private fields
 LL |     let Box(a) = loop { };
    |         ^^^ constructor is not visible here due to private fields
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0532`.
diff --git a/tests/ui/issues/issue-38458.stderr b/tests/ui/issues/issue-38458.stderr
index c04a01118..fbf88d503 100644
--- a/tests/ui/issues/issue-38458.stderr
+++ b/tests/ui/issues/issue-38458.stderr
@@ -4,6 +4,6 @@ error[E0572]: return statement outside of function body
 LL |     return;
    |     ^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0572`.
diff --git a/tests/ui/issues/issue-38919.stderr b/tests/ui/issues/issue-38919.stderr
index f9ab8a515..4a4bd2ee4 100644
--- a/tests/ui/issues/issue-38919.stderr
+++ b/tests/ui/issues/issue-38919.stderr
@@ -6,6 +6,6 @@ LL | fn foo<T: Iterator>() {
 LL |     T::Item;
    |        ^^^^ associated item not found in `T`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-38954.stderr b/tests/ui/issues/issue-38954.stderr
index ab15bb1af..4dd83ddf3 100644
--- a/tests/ui/issues/issue-38954.stderr
+++ b/tests/ui/issues/issue-38954.stderr
@@ -11,6 +11,6 @@ help: function arguments must have a statically known size, borrowed types alway
 LL | fn _test(ref _p: &str) {}
    |                  +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-39175.stderr b/tests/ui/issues/issue-39175.stderr
index 3a1476ac0..1bc11dab3 100644
--- a/tests/ui/issues/issue-39175.stderr
+++ b/tests/ui/issues/issue-39175.stderr
@@ -10,6 +10,6 @@ help: the following trait is implemented but not in scope; perhaps add a `use` f
 LL + use std::os::unix::process::CommandExt;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-39211.stderr b/tests/ui/issues/issue-39211.stderr
index cd2a014bb..15c9a80bb 100644
--- a/tests/ui/issues/issue-39211.stderr
+++ b/tests/ui/issues/issue-39211.stderr
@@ -6,5 +6,5 @@ LL |     let a = [3; M::Row::DIM];
    |
    = note: this may fail depending on what value the parameter takes
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-39687.stderr b/tests/ui/issues/issue-39687.stderr
index b1b3041ea..f4742115a 100644
--- a/tests/ui/issues/issue-39687.stderr
+++ b/tests/ui/issues/issue-39687.stderr
@@ -4,6 +4,6 @@ error[E0229]: associated type bindings are not allowed here
 LL |     <fn() as Fn()>::call;
    |              ^^^^ associated type not allowed here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0229`.
diff --git a/tests/ui/issues/issue-39848.rs b/tests/ui/issues/issue-39848.rs
index 1964d7399..2a059120e 100644
--- a/tests/ui/issues/issue-39848.rs
+++ b/tests/ui/issues/issue-39848.rs
@@ -1,6 +1,6 @@
 macro_rules! get_opt {
     ($tgt:expr, $field:ident) => {
-        if $tgt.has_$field() {} //~ ERROR expected `{`, found `foo`
+        if $tgt.has_$field() {} //~ ERROR expected `{`, found identifier `foo`
     }
 }
 
diff --git a/tests/ui/issues/issue-39848.stderr b/tests/ui/issues/issue-39848.stderr
index 387ef0776..a6c6c61f1 100644
--- a/tests/ui/issues/issue-39848.stderr
+++ b/tests/ui/issues/issue-39848.stderr
@@ -1,4 +1,4 @@
-error: expected `{`, found `foo`
+error: expected `{`, found identifier `foo`
   --> $DIR/issue-39848.rs:3:21
    |
 LL |         if $tgt.has_$field() {}
@@ -21,5 +21,5 @@ help: try placing this code inside a block
 LL |         if $tgt.has_{ $field() } {}
    |                     +          +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-3993.stderr b/tests/ui/issues/issue-3993.stderr
index deecf7a9d..cf839a131 100644
--- a/tests/ui/issues/issue-3993.stderr
+++ b/tests/ui/issues/issue-3993.stderr
@@ -10,6 +10,6 @@ note: the function `fly` is defined here
 LL |     fn fly() {}
    |     ^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0603`.
diff --git a/tests/ui/issues/issue-39970.stderr b/tests/ui/issues/issue-39970.stderr
index 713bc404f..0fe73574b 100644
--- a/tests/ui/issues/issue-39970.stderr
+++ b/tests/ui/issues/issue-39970.stderr
@@ -18,6 +18,6 @@ LL |     //(): for<'a> Array<'a, Element=&'a ()>, // No ICE
 LL |     (): for<'a> Array<'a, Element=()>, // ICE
    |                           ---------- unsatisfied trait bound introduced here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0271`.
diff --git a/tests/ui/issues/issue-40288.stderr b/tests/ui/issues/issue-40288.stderr
index db5d06437..180adcd6e 100644
--- a/tests/ui/issues/issue-40288.stderr
+++ b/tests/ui/issues/issue-40288.stderr
@@ -10,6 +10,6 @@ LL |     *refr = 3;
 LL |     println!("{:?}", out[0]);
    |                      ------ borrow later used here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0506`.
diff --git a/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr
index e15eed656..7976d0905 100644
--- a/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr
@@ -9,6 +9,6 @@ help: consider borrowing here
 LL |     let e = &f.v[0];
    |             +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
index 1bc554efb..987558903 100644
--- a/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
+++ b/tests/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr
@@ -13,6 +13,6 @@ help: consider borrowing here
 LL |     let (a, b) = &x[0];
    |                  +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/issues/issue-40510-1.migrate.stderr b/tests/ui/issues/issue-40510-1.migrate.stderr
index 776a724d3..209053057 100644
--- a/tests/ui/issues/issue-40510-1.migrate.stderr
+++ b/tests/ui/issues/issue-40510-1.migrate.stderr
@@ -9,5 +9,5 @@ LL |         &mut x
    = note: `FnMut` closures only have access to their captured variables while they are executing...
    = note: ...therefore, they cannot allow references to captured variables to escape
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-40510-1.stderr b/tests/ui/issues/issue-40510-1.stderr
index e88f31ea1..81fed1305 100644
--- a/tests/ui/issues/issue-40510-1.stderr
+++ b/tests/ui/issues/issue-40510-1.stderr
@@ -15,5 +15,5 @@ LL |         &mut x
    = note: `FnMut` closures only have access to their captured variables while they are executing...
    = note: ...therefore, they cannot allow references to captured variables to escape
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-40510-3.migrate.stderr b/tests/ui/issues/issue-40510-3.migrate.stderr
index a49475a85..59aba4a8e 100644
--- a/tests/ui/issues/issue-40510-3.migrate.stderr
+++ b/tests/ui/issues/issue-40510-3.migrate.stderr
@@ -11,5 +11,5 @@ LL | |         }
    = note: `FnMut` closures only have access to their captured variables while they are executing...
    = note: ...therefore, they cannot allow references to captured variables to escape
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-40510-3.stderr b/tests/ui/issues/issue-40510-3.stderr
index eb077415e..43e8a73b8 100644
--- a/tests/ui/issues/issue-40510-3.stderr
+++ b/tests/ui/issues/issue-40510-3.stderr
@@ -19,5 +19,5 @@ help: consider adding 'move' keyword before the nested closure
 LL |         move || {
    |         ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-40610.stderr b/tests/ui/issues/issue-40610.stderr
index b4e302dff..1bd1c4dd5 100644
--- a/tests/ui/issues/issue-40610.stderr
+++ b/tests/ui/issues/issue-40610.stderr
@@ -6,6 +6,6 @@ LL |     () + f(&[1.0]);
    |     |
    |     ()
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.
diff --git a/tests/ui/issues/issue-40749.stderr b/tests/ui/issues/issue-40749.stderr
index afc39adec..f7770e000 100644
--- a/tests/ui/issues/issue-40749.stderr
+++ b/tests/ui/issues/issue-40749.stderr
@@ -7,6 +7,6 @@ LL |     [0; ..10];
    = note: expected type `usize`
             found struct `RangeTo<{integer}>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-40861.stderr b/tests/ui/issues/issue-40861.stderr
index 9b6469d05..dec9af4b6 100644
--- a/tests/ui/issues/issue-40861.stderr
+++ b/tests/ui/issues/issue-40861.stderr
@@ -6,6 +6,6 @@ LL |     ()[f(&[1.0])];
    |
    = help: to access tuple elements, use tuple indexing syntax (e.g., `tuple.0`)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0608`.
diff --git a/tests/ui/issues/issue-41139.stderr b/tests/ui/issues/issue-41139.stderr
index 97492e6e0..d7b35245d 100644
--- a/tests/ui/issues/issue-41139.stderr
+++ b/tests/ui/issues/issue-41139.stderr
@@ -7,6 +7,6 @@ LL | fn get_function<'a>() -> &'a dyn Fn() -> dyn Trait {
 LL |     let t: &dyn Trait = &get_function()();
    |                          ^^^^^^^^^^^^^^ this trait object returns an unsized value `(dyn Trait + 'static)`, so it cannot be called
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-41229-ref-str.stderr b/tests/ui/issues/issue-41229-ref-str.stderr
index 31fdf3b72..afc2cac73 100644
--- a/tests/ui/issues/issue-41229-ref-str.stderr
+++ b/tests/ui/issues/issue-41229-ref-str.stderr
@@ -11,6 +11,6 @@ help: function arguments must have a statically known size, borrowed types alway
 LL | pub fn example(ref s: &str) {}
    |                       +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-41549.stderr b/tests/ui/issues/issue-41549.stderr
index 62307d387..55be59684 100644
--- a/tests/ui/issues/issue-41549.stderr
+++ b/tests/ui/issues/issue-41549.stderr
@@ -4,6 +4,6 @@ error[E0326]: implemented const `CONST` has an incompatible type for trait
 LL |     const CONST: () = ();
    |                  ^^ expected `u32`, found `()`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0326`.
diff --git a/tests/ui/issues/issue-41652/issue-41652.stderr b/tests/ui/issues/issue-41652/issue-41652.stderr
index 1618f0f5a..a5a2fab2e 100644
--- a/tests/ui/issues/issue-41652/issue-41652.stderr
+++ b/tests/ui/issues/issue-41652/issue-41652.stderr
@@ -9,6 +9,6 @@ help: you must specify a concrete type for this numeric value, like `i32`
 LL |         3_i32.f()
    |         ~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0689`.
diff --git a/tests/ui/issues/issue-41726.stderr b/tests/ui/issues/issue-41726.stderr
index 7c87fde54..fe7d4df70 100644
--- a/tests/ui/issues/issue-41726.stderr
+++ b/tests/ui/issues/issue-41726.stderr
@@ -7,6 +7,6 @@ LL |         things[src.as_str()].sort();
    = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `HashMap<String, Vec<String>>`
    = help: to modify a `HashMap<String, Vec<String>>`, use `.get_mut()`, `.insert()` or the entry API
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0596`.
diff --git a/tests/ui/issues/issue-41742.stderr b/tests/ui/issues/issue-41742.stderr
index 61a0ae5fa..47c7e5dc1 100644
--- a/tests/ui/issues/issue-41742.stderr
+++ b/tests/ui/issues/issue-41742.stderr
@@ -4,6 +4,6 @@ error[E0308]: mismatched types
 LL |     H["?"].f();
    |       ^^^ expected `u32`, found `&str`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-41880.stderr b/tests/ui/issues/issue-41880.stderr
index 6414e2692..9d09be663 100644
--- a/tests/ui/issues/issue-41880.stderr
+++ b/tests/ui/issues/issue-41880.stderr
@@ -7,6 +7,6 @@ LL | pub struct Iterate<T, F> {
 LL |     println!("{:?}", a.iter().take(10).collect::<Vec<usize>>());
    |                        ^^^^ method not found in `Iterate<{integer}, {closure@issue-41880.rs:26:24}>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-42106.stderr b/tests/ui/issues/issue-42106.stderr
index d5a9d233b..d5919870d 100644
--- a/tests/ui/issues/issue-42106.stderr
+++ b/tests/ui/issues/issue-42106.stderr
@@ -8,6 +8,6 @@ LL |     collection.swap(1, 2);
 LL |     _a.use_ref();
    |     -- immutable borrow later used here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0502`.
diff --git a/tests/ui/issues/issue-42210.rs b/tests/ui/issues/issue-42210.rs
index 01a5d5636..318e3099f 100644
--- a/tests/ui/issues/issue-42210.rs
+++ b/tests/ui/issues/issue-42210.rs
@@ -2,7 +2,6 @@
 // Regression test for #42210.
 
 // compile-flags: -g
-// ignore-asmjs wasm2js does not support source maps yet
 
 trait Foo {
     fn foo() { }
diff --git a/tests/ui/issues/issue-4265.stderr b/tests/ui/issues/issue-4265.stderr
index 8c7303f3c..48b1c762e 100644
--- a/tests/ui/issues/issue-4265.stderr
+++ b/tests/ui/issues/issue-4265.stderr
@@ -7,6 +7,6 @@ LL |     fn bar() {
 LL |     fn bar() {
    |     ^^^^^^^^ duplicate definitions for `bar`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0592`.
diff --git a/tests/ui/issues/issue-42755.stderr b/tests/ui/issues/issue-42755.stderr
index 12047e22f..41f6cc97e 100644
--- a/tests/ui/issues/issue-42755.stderr
+++ b/tests/ui/issues/issue-42755.stderr
@@ -4,5 +4,5 @@ error: repetition matches empty token tree
 LL |     ($($p:vis)*) => {}
    |       ^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-42796.stderr b/tests/ui/issues/issue-42796.stderr
index f2971df5d..670b98c77 100644
--- a/tests/ui/issues/issue-42796.stderr
+++ b/tests/ui/issues/issue-42796.stderr
@@ -15,6 +15,6 @@ help: consider cloning the value if the performance cost is acceptable
 LL |     let mut s_copy = s.clone();
    |                       ++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-42880.stderr b/tests/ui/issues/issue-42880.stderr
index bec14429d..f174f42b2 100644
--- a/tests/ui/issues/issue-42880.stderr
+++ b/tests/ui/issues/issue-42880.stderr
@@ -4,6 +4,6 @@ error[E0599]: no associated item named `String` found for struct `String` in the
 LL |     let f = |&Value::String(_)| ();
    |                      ^^^^^^ associated item not found in `String`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-4335.stderr b/tests/ui/issues/issue-4335.stderr
index ecc1fa523..8b4aff54d 100644
--- a/tests/ui/issues/issue-4335.stderr
+++ b/tests/ui/issues/issue-4335.stderr
@@ -8,6 +8,6 @@ LL |     id(Box::new(|| *v))
    |                 |
    |                 captured by this `FnMut` closure
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/issues/issue-43355.stderr b/tests/ui/issues/issue-43355.stderr
index 9aeca8efe..25179ef6a 100644
--- a/tests/ui/issues/issue-43355.stderr
+++ b/tests/ui/issues/issue-43355.stderr
@@ -9,6 +9,6 @@ LL | impl<X> Trait1<Box<X>> for A {
    |
    = note: downstream crates may implement trait `Trait2<std::boxed::Box<_>>` for type `A`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0119`.
diff --git a/tests/ui/issues/issue-43420-no-over-suggest.stderr b/tests/ui/issues/issue-43420-no-over-suggest.stderr
index 9b141e2bf..3da8cc728 100644
--- a/tests/ui/issues/issue-43420-no-over-suggest.stderr
+++ b/tests/ui/issues/issue-43420-no-over-suggest.stderr
@@ -14,6 +14,6 @@ note: function defined here
 LL | fn foo(b: &[u16]) {}
    |    ^^^ ---------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-43424.stderr b/tests/ui/issues/issue-43424.stderr
index 8f59d7cc3..64a3c2a3d 100644
--- a/tests/ui/issues/issue-43424.stderr
+++ b/tests/ui/issues/issue-43424.stderr
@@ -4,5 +4,5 @@ error: unexpected generic arguments in path
 LL | m!(inline<u8>);
    |          ^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-43431.stderr b/tests/ui/issues/issue-43431.stderr
index 4edb52869..6d47ba271 100644
--- a/tests/ui/issues/issue-43431.stderr
+++ b/tests/ui/issues/issue-43431.stderr
@@ -4,6 +4,6 @@ error[E0229]: associated type bindings are not allowed here
 LL |         <Self as Fn(A) -> B>::call(self, (a,))
    |                           ^ associated type not allowed here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0229`.
diff --git a/tests/ui/issues/issue-43925.stderr b/tests/ui/issues/issue-43925.stderr
index b0ad25063..7cc347c61 100644
--- a/tests/ui/issues/issue-43925.stderr
+++ b/tests/ui/issues/issue-43925.stderr
@@ -4,5 +4,5 @@ error: link cfg must have a single predicate argument
 LL | #[link(name = "foo", cfg("rlib"))]
    |                      ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-43926.stderr b/tests/ui/issues/issue-43926.stderr
index f67f91a6b..7c5c50a38 100644
--- a/tests/ui/issues/issue-43926.stderr
+++ b/tests/ui/issues/issue-43926.stderr
@@ -4,5 +4,5 @@ error: link cfg must have a single predicate argument
 LL | #[link(name = "foo", cfg())]
    |                      ^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-44023.stderr b/tests/ui/issues/issue-44023.stderr
index 9e9701241..8554154fb 100644
--- a/tests/ui/issues/issue-44023.stderr
+++ b/tests/ui/issues/issue-44023.stderr
@@ -6,6 +6,6 @@ LL | fn საჭმელად_გემრიელი_სადილი ( )
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-44078.stderr b/tests/ui/issues/issue-44078.stderr
index daf67219f..3e12de34e 100644
--- a/tests/ui/issues/issue-44078.stderr
+++ b/tests/ui/issues/issue-44078.stderr
@@ -6,6 +6,6 @@ LL |       "😊"";
 LL | | }
    | |__^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0765`.
diff --git a/tests/ui/issues/issue-44239.stderr b/tests/ui/issues/issue-44239.stderr
index 2a245c92c..633fb177b 100644
--- a/tests/ui/issues/issue-44239.stderr
+++ b/tests/ui/issues/issue-44239.stderr
@@ -7,6 +7,6 @@ LL |     let n: usize = 0;
 LL |         const N: usize = n;
    |                          ^ non-constant value
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0435`.
diff --git a/tests/ui/issues/issue-44405.stderr b/tests/ui/issues/issue-44405.stderr
index 1fd69f6e7..26d2b385e 100644
--- a/tests/ui/issues/issue-44405.stderr
+++ b/tests/ui/issues/issue-44405.stderr
@@ -6,6 +6,6 @@ LL |     container[&mut val].test();
    |
    = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `Container`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0596`.
diff --git a/tests/ui/issues/issue-4517.stderr b/tests/ui/issues/issue-4517.stderr
index 78ee336f1..5d544ee10 100644
--- a/tests/ui/issues/issue-4517.stderr
+++ b/tests/ui/issues/issue-4517.stderr
@@ -12,6 +12,6 @@ note: function defined here
 LL | fn bar(int_param: usize) {}
    |    ^^^ ----------------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-45562.stderr b/tests/ui/issues/issue-45562.stderr
index be259d3f8..6fae86f9f 100644
--- a/tests/ui/issues/issue-45562.stderr
+++ b/tests/ui/issues/issue-45562.stderr
@@ -8,5 +8,5 @@ LL | #[no_mangle] pub const RAH: usize = 5;
    |
    = note: `#[deny(no_mangle_const_items)]` on by default
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-45731.rs b/tests/ui/issues/issue-45731.rs
index 5c5ac5987..d20c07276 100644
--- a/tests/ui/issues/issue-45731.rs
+++ b/tests/ui/issues/issue-45731.rs
@@ -1,7 +1,6 @@
 // run-pass
 #![allow(unused_variables)]
 // compile-flags:--test -g
-// ignore-asmjs wasm2js does not support source maps yet
 
 #[cfg(target_os = "macos")]
 #[test]
diff --git a/tests/ui/issues/issue-45801.stderr b/tests/ui/issues/issue-45801.stderr
index e651e2a68..5a10c4295 100644
--- a/tests/ui/issues/issue-45801.stderr
+++ b/tests/ui/issues/issue-45801.stderr
@@ -7,6 +7,6 @@ LL |     req.get_ref::<Params>();
    = help: the trait `Plugin<Foo>` is implemented for `Params`
    = help: for that trait implementation, expected `Foo`, found `i32`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-45965.stderr b/tests/ui/issues/issue-45965.stderr
index f3eaa9176..95a39b1d1 100644
--- a/tests/ui/issues/issue-45965.stderr
+++ b/tests/ui/issues/issue-45965.stderr
@@ -6,6 +6,6 @@ LL |     let a = |r: f64| if r != 0.0(r != 0.0) { 1.0 } else { 0.0 };
    |                              |
    |                              call expression requires function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-46302.stderr b/tests/ui/issues/issue-46302.stderr
index 6e126038c..e87c17b2a 100644
--- a/tests/ui/issues/issue-46302.stderr
+++ b/tests/ui/issues/issue-46302.stderr
@@ -9,6 +9,6 @@ help: consider borrowing here
 LL |   let u: &str = if true { &s[..2] } else { s };
    |                           +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-46311.stderr b/tests/ui/issues/issue-46311.stderr
index d72d6477d..86a360289 100644
--- a/tests/ui/issues/issue-46311.stderr
+++ b/tests/ui/issues/issue-46311.stderr
@@ -4,5 +4,5 @@ error: invalid label name `'break`
 LL |     'break: loop {
    |     ^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-46332.stderr b/tests/ui/issues/issue-46332.stderr
index 890ef8014..8c0c1dfa6 100644
--- a/tests/ui/issues/issue-46332.stderr
+++ b/tests/ui/issues/issue-46332.stderr
@@ -7,6 +7,6 @@ LL | struct TyUint {}
 LL |     TyUInt {};
    |     ^^^^^^ help: a struct with a similar name exists (notice the capitalization): `TyUint`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0422`.
diff --git a/tests/ui/issues/issue-46438.stderr b/tests/ui/issues/issue-46438.stderr
index c1fad44b8..aff2d77a0 100644
--- a/tests/ui/issues/issue-46438.stderr
+++ b/tests/ui/issues/issue-46438.stderr
@@ -4,5 +4,5 @@ error: expected a trait, found type
 LL | m!(&'static u8);
    |    ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-46471-1.stderr b/tests/ui/issues/issue-46471-1.stderr
index 2ae6e709d..d45172239 100644
--- a/tests/ui/issues/issue-46471-1.stderr
+++ b/tests/ui/issues/issue-46471-1.stderr
@@ -8,6 +8,6 @@ LL |         &mut z
 LL |     };
    |     - `z` dropped here while still borrowed
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0597`.
diff --git a/tests/ui/issues/issue-46472.stderr b/tests/ui/issues/issue-46472.stderr
index 6e561e03a..6115da28c 100644
--- a/tests/ui/issues/issue-46472.stderr
+++ b/tests/ui/issues/issue-46472.stderr
@@ -7,6 +7,6 @@ LL |     &mut 4
    |     |    temporary value created here
    |     returns a reference to data owned by the current function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0515`.
diff --git a/tests/ui/issues/issue-46771.stderr b/tests/ui/issues/issue-46771.stderr
index 512827b2d..fab55fbfd 100644
--- a/tests/ui/issues/issue-46771.stderr
+++ b/tests/ui/issues/issue-46771.stderr
@@ -8,6 +8,6 @@ LL |     (1 .. 2).find(|_| Foo(0) == 0);
    |                       |
    |                       call expression requires function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0618`.
diff --git a/tests/ui/issues/issue-46983.stderr b/tests/ui/issues/issue-46983.stderr
index 38a219bbd..f47df306a 100644
--- a/tests/ui/issues/issue-46983.stderr
+++ b/tests/ui/issues/issue-46983.stderr
@@ -6,5 +6,5 @@ LL | fn foo(x: &u32) -> &'static u32 {
 LL |     &*x
    |     ^^^ returning this value requires that `'1` must outlive `'static`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
index 5e1b816de..0aa1ae722 100644
--- a/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
+++ b/tests/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr
@@ -2,7 +2,12 @@ error[E0609]: no field `00` on type `Verdict`
   --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:8:30
    |
 LL |     let _condemned = justice.00;
-   |                              ^^ help: a field with a similar name exists: `0`
+   |                              ^^ unknown field
+   |
+help: a field with a similar name exists
+   |
+LL |     let _condemned = justice.0;
+   |                              ~
 
 error[E0609]: no field `001` on type `Verdict`
   --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:10:31
diff --git a/tests/ui/issues/issue-47184.stderr b/tests/ui/issues/issue-47184.stderr
index c2c7df7a3..d25c6eda9 100644
--- a/tests/ui/issues/issue-47184.stderr
+++ b/tests/ui/issues/issue-47184.stderr
@@ -7,6 +7,6 @@ LL |     let _vec: Vec<&'static String> = vec![&String::new()];
    |               |                            creates a temporary value which is freed while still in use
    |               type annotation requires that borrow lasts for `'static`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0716`.
diff --git a/tests/ui/issues/issue-4736.stderr b/tests/ui/issues/issue-4736.stderr
index 2a1f1819c..146dd1d57 100644
--- a/tests/ui/issues/issue-4736.stderr
+++ b/tests/ui/issues/issue-4736.stderr
@@ -12,6 +12,6 @@ help: `NonCopyable` is a tuple struct, use the appropriate syntax
 LL |     let z = NonCopyable(/* fields */);
    |             ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0560`.
diff --git a/tests/ui/issues/issue-47377.stderr b/tests/ui/issues/issue-47377.stderr
index 4f0fd948e..12e5c15d7 100644
--- a/tests/ui/issues/issue-47377.stderr
+++ b/tests/ui/issues/issue-47377.stderr
@@ -13,6 +13,6 @@ help: create an owned `String` from a string reference
 LL |      let _a = b.to_owned() + ", World!";
    |                +++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.
diff --git a/tests/ui/issues/issue-47380.stderr b/tests/ui/issues/issue-47380.stderr
index b04ac5536..4fca0296e 100644
--- a/tests/ui/issues/issue-47380.stderr
+++ b/tests/ui/issues/issue-47380.stderr
@@ -13,6 +13,6 @@ help: create an owned `String` from a string reference
 LL |     println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!";
    |                                       +++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.
diff --git a/tests/ui/issues/issue-47725.stderr b/tests/ui/issues/issue-47725.stderr
index 7143fb4d6..0d3b77b46 100644
--- a/tests/ui/issues/issue-47725.stderr
+++ b/tests/ui/issues/issue-47725.stderr
@@ -56,5 +56,5 @@ help: try `#[link(name = "...")]` instead
 LL | #[link_name]
    | ^^^^^^^^^^^^
 
-error: aborting due to previous error; 3 warnings emitted
+error: aborting due to 1 previous error; 3 warnings emitted
 
diff --git a/tests/ui/issues/issue-48364.stderr b/tests/ui/issues/issue-48364.stderr
index 3f2e1b83a..74bfa1e06 100644
--- a/tests/ui/issues/issue-48364.stderr
+++ b/tests/ui/issues/issue-48364.stderr
@@ -11,6 +11,6 @@ LL |     b"".starts_with(stringify!(foo))
 note: method defined here
   --> $SRC_DIR/core/src/slice/mod.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-48728.stderr b/tests/ui/issues/issue-48728.stderr
index 0bb46724f..6b4247f1d 100644
--- a/tests/ui/issues/issue-48728.stderr
+++ b/tests/ui/issues/issue-48728.stderr
@@ -10,6 +10,6 @@ LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
    = note: upstream crates may add a new impl of trait `std::clone::Clone` for type `[_]` in future versions
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0119`.
diff --git a/tests/ui/issues/issue-48838.stderr b/tests/ui/issues/issue-48838.stderr
index 159199a7f..504ea3e80 100644
--- a/tests/ui/issues/issue-48838.stderr
+++ b/tests/ui/issues/issue-48838.stderr
@@ -7,6 +7,6 @@ LL |     Square = |x| x,
    = note: expected type `isize`
            found closure `{closure@$DIR/issue-48838.rs:2:14: 2:17}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-4935.stderr b/tests/ui/issues/issue-4935.stderr
index e544e4244..25f299ae5 100644
--- a/tests/ui/issues/issue-4935.stderr
+++ b/tests/ui/issues/issue-4935.stderr
@@ -13,6 +13,6 @@ note: function defined here
 LL | fn foo(a: usize) {}
    |    ^^^ --------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.
diff --git a/tests/ui/issues/issue-4968.stderr b/tests/ui/issues/issue-4968.stderr
index 1ce033384..549e55094 100644
--- a/tests/ui/issues/issue-4968.stderr
+++ b/tests/ui/issues/issue-4968.stderr
@@ -15,6 +15,6 @@ LL |     match 42 { A => () }
    = note: expected type `{integer}`
              found tuple `(isize, isize)`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-4972.stderr b/tests/ui/issues/issue-4972.stderr
index 83daded7e..8de3909ca 100644
--- a/tests/ui/issues/issue-4972.stderr
+++ b/tests/ui/issues/issue-4972.stderr
@@ -4,6 +4,6 @@ error[E0033]: type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced
 LL |         TraitWrapper::A(box ref map) => map,
    |                         ^^^^^^^^^^^ type `Box<(dyn MyTrait + 'static)>` cannot be dereferenced
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0033`.
diff --git a/tests/ui/issues/issue-49824.stderr b/tests/ui/issues/issue-49824.stderr
index 14beadece..1c77090de 100644
--- a/tests/ui/issues/issue-49824.stderr
+++ b/tests/ui/issues/issue-49824.stderr
@@ -19,5 +19,5 @@ help: consider adding 'move' keyword before the nested closure
 LL |         move || {
    |         ++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-49919.stderr b/tests/ui/issues/issue-49919.stderr
index 8098be5cc..597d76fc2 100644
--- a/tests/ui/issues/issue-49919.stderr
+++ b/tests/ui/issues/issue-49919.stderr
@@ -4,6 +4,6 @@ error[E0582]: binding for associated type `Output` references lifetime `'c`, whi
 LL |     let foo: Box<dyn for <'c> Fn() -> &'c T> = Box::new(move || &t);
    |                                       ^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0582`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
index ce8173169..84247a427 100644
--- a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
@@ -7,6 +7,6 @@ LL |     let _result = &Some(42).as_deref();
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
index 943f77486..bf05ab566 100644
--- a/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
@@ -7,6 +7,6 @@ LL |     let _result = &mut Some(42).as_deref_mut();
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
index a3b9ac677..ac744a6d3 100644
--- a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
@@ -7,6 +7,6 @@ LL |     let _result = &Ok(42).as_deref();
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
index aa771e4c0..688d2cf34 100644
--- a/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
+++ b/tests/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
@@ -7,6 +7,6 @@ LL |     let _result = &mut Ok(42).as_deref_mut();
    = note: the following trait bounds were not satisfied:
            `{integer}: Deref`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-50403.stderr b/tests/ui/issues/issue-50403.stderr
index d50befa5e..193d815d5 100644
--- a/tests/ui/issues/issue-50403.stderr
+++ b/tests/ui/issues/issue-50403.stderr
@@ -4,5 +4,5 @@ error: `concat_idents!()` takes 1 or more arguments
 LL |     let x = concat_idents!();
    |             ^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-50571.stderr b/tests/ui/issues/issue-50571.stderr
index f69963bb7..fe47790f1 100644
--- a/tests/ui/issues/issue-50571.stderr
+++ b/tests/ui/issues/issue-50571.stderr
@@ -9,6 +9,6 @@ help: give this argument a name or use an underscore to ignore it
 LL |     fn foo(_: [i32; 2]) {}
    |            ~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0642`.
diff --git a/tests/ui/issues/issue-50581.stderr b/tests/ui/issues/issue-50581.stderr
index 07b6df072..bac1ade3b 100644
--- a/tests/ui/issues/issue-50581.stderr
+++ b/tests/ui/issues/issue-50581.stderr
@@ -4,6 +4,6 @@ error[E0268]: `break` outside of a loop or labeled block
 LL |     |_: [u8; break]| ();
    |              ^^^^^ cannot `break` outside of a loop or labeled block
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0268`.
diff --git a/tests/ui/issues/issue-50600.stderr b/tests/ui/issues/issue-50600.stderr
index d285c3467..e3ae7f144 100644
--- a/tests/ui/issues/issue-50600.stderr
+++ b/tests/ui/issues/issue-50600.stderr
@@ -7,6 +7,6 @@ LL |     fn([u8; |x: u8| {}]),
    = note: expected type `usize`
            found closure `{closure@$DIR/issue-50600.rs:2:13: 2:20}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-50618.stderr b/tests/ui/issues/issue-50618.stderr
index 1ac5dde66..1a3514fb7 100644
--- a/tests/ui/issues/issue-50618.stderr
+++ b/tests/ui/issues/issue-50618.stderr
@@ -6,6 +6,6 @@ LL |             nonexistent: 0,
    |
    = note: available fields are: `x`, `y`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0560`.
diff --git a/tests/ui/issues/issue-5062.stderr b/tests/ui/issues/issue-5062.stderr
index 3191bd3de..0839ece79 100644
--- a/tests/ui/issues/issue-5062.stderr
+++ b/tests/ui/issues/issue-5062.stderr
@@ -9,6 +9,6 @@ help: consider specifying the generic argument
 LL | fn main() { format!("{:?}", None::<T>); }
    |                                 +++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-50688.stderr b/tests/ui/issues/issue-50688.stderr
index df7603d79..873f179f5 100644
--- a/tests/ui/issues/issue-50688.stderr
+++ b/tests/ui/issues/issue-50688.stderr
@@ -7,6 +7,6 @@ LL |     [1; || {}];
    = note: expected type `usize`
            found closure `{closure@$DIR/issue-50688.rs:2:9: 2:11}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-50714-1.stderr b/tests/ui/issues/issue-50714-1.stderr
index bacd09b2a..7593ac383 100644
--- a/tests/ui/issues/issue-50714-1.stderr
+++ b/tests/ui/issues/issue-50714-1.stderr
@@ -4,6 +4,6 @@ error[E0647]: `#[start]` function is not allowed to have a `where` clause
 LL | fn start(_: isize, _: *const *const u8) -> isize where fn(&()): Eq {
    |                                                  ^^^^^^^^^^^^^^^^^ `#[start]` function cannot have a `where` clause
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0647`.
diff --git a/tests/ui/issues/issue-50714.stderr b/tests/ui/issues/issue-50714.stderr
index a11aceb62..57f9769d1 100644
--- a/tests/ui/issues/issue-50714.stderr
+++ b/tests/ui/issues/issue-50714.stderr
@@ -4,6 +4,6 @@ error[E0646]: `main` function is not allowed to have a `where` clause
 LL | fn main() where fn(&()): Eq {}
    |           ^^^^^^^^^^^^^^^^^ `main` cannot have a `where` clause
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0646`.
diff --git a/tests/ui/issues/issue-50781.stderr b/tests/ui/issues/issue-50781.stderr
index e185ecdda..beaea1e63 100644
--- a/tests/ui/issues/issue-50781.stderr
+++ b/tests/ui/issues/issue-50781.stderr
@@ -20,5 +20,5 @@ note: the lint level is defined here
 LL | #![deny(where_clauses_object_safety)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-50802.stderr b/tests/ui/issues/issue-50802.stderr
index e064fabcc..e1b5ae325 100644
--- a/tests/ui/issues/issue-50802.stderr
+++ b/tests/ui/issues/issue-50802.stderr
@@ -4,6 +4,6 @@ error[E0590]: `break` or `continue` with no label in the condition of a `while`
 LL |         break while continue {
    |                     ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0590`.
diff --git a/tests/ui/issues/issue-51022.stderr b/tests/ui/issues/issue-51022.stderr
index 5e196bd4e..c02c0ac93 100644
--- a/tests/ui/issues/issue-51022.stderr
+++ b/tests/ui/issues/issue-51022.stderr
@@ -4,6 +4,6 @@ error[E0131]: `main` function is not allowed to have generic parameters
 LL | fn main<'a>() { }
    |        ^^^^ `main` cannot have generic parameters
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0131`.
diff --git a/tests/ui/issues/issue-51116.stderr b/tests/ui/issues/issue-51116.stderr
index c07f8735e..4839a0d46 100644
--- a/tests/ui/issues/issue-51116.stderr
+++ b/tests/ui/issues/issue-51116.stderr
@@ -4,6 +4,6 @@ error[E0282]: type annotations needed
 LL |             *tile = 0;
    |             ^^^^^ cannot infer type
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.
diff --git a/tests/ui/issues/issue-51154.stderr b/tests/ui/issues/issue-51154.stderr
index 5ae8e0678..b7451ea28 100644
--- a/tests/ui/issues/issue-51154.stderr
+++ b/tests/ui/issues/issue-51154.stderr
@@ -14,6 +14,6 @@ LL |     let _: Box<F> = Box::new(|| ());
 note: associated function defined here
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-5153.stderr b/tests/ui/issues/issue-5153.stderr
index 93aaf4b9d..53c140b5b 100644
--- a/tests/ui/issues/issue-5153.stderr
+++ b/tests/ui/issues/issue-5153.stderr
@@ -7,6 +7,6 @@ LL |     fn foo(self: Box<Self>);
 LL |     (&5isize as &dyn Foo).foo();
    |                           ^^^ method not found in `&dyn Foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
index c92da53db..99fce1eee 100644
--- a/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
+++ b/tests/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
@@ -19,6 +19,6 @@ help: try wrapping the expression in `Ok`
 LL |     Ok(missing_discourses()?)
    |     +++                     +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-51874.stderr b/tests/ui/issues/issue-51874.stderr
index b39159a65..5be3695dd 100644
--- a/tests/ui/issues/issue-51874.stderr
+++ b/tests/ui/issues/issue-51874.stderr
@@ -9,6 +9,6 @@ help: you must specify a concrete type for this numeric value, like `f32`
 LL |     let a = (1.0_f32).pow(1.0);
    |              ~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0689`.
diff --git a/tests/ui/issues/issue-52049.stderr b/tests/ui/issues/issue-52049.stderr
index 0812976cf..1d8e136f2 100644
--- a/tests/ui/issues/issue-52049.stderr
+++ b/tests/ui/issues/issue-52049.stderr
@@ -7,6 +7,6 @@ LL |     foo(&unpromotable(5u32));
    |     |    creates a temporary value which is freed while still in use
    |     argument requires that borrow lasts for `'static`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0716`.
diff --git a/tests/ui/issues/issue-52126-assign-op-invariance.stderr b/tests/ui/issues/issue-52126-assign-op-invariance.stderr
index 316e755f4..af9553e5c 100644
--- a/tests/ui/issues/issue-52126-assign-op-invariance.stderr
+++ b/tests/ui/issues/issue-52126-assign-op-invariance.stderr
@@ -12,6 +12,6 @@ LL |         acc += cnt2;
 LL |     }
    |     - `line` dropped here while still borrowed
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0597`.
diff --git a/tests/ui/issues/issue-52262.stderr b/tests/ui/issues/issue-52262.stderr
index ef41f078b..ce8e6fe2b 100644
--- a/tests/ui/issues/issue-52262.stderr
+++ b/tests/ui/issues/issue-52262.stderr
@@ -4,6 +4,6 @@ error[E0507]: cannot move out of `*key` which is behind a shared reference
 LL |                 String::from_utf8(*key).unwrap()
    |                                   ^^^^ move occurs because `*key` has type `Vec<u8>`, which does not implement the `Copy` trait
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/issues/issue-5239-1.stderr b/tests/ui/issues/issue-5239-1.stderr
index f53ddb954..63c2dbfc5 100644
--- a/tests/ui/issues/issue-5239-1.stderr
+++ b/tests/ui/issues/issue-5239-1.stderr
@@ -6,6 +6,6 @@ LL |     let x = |ref x: isize| { x += 1; };
    |                              |
    |                              cannot use `+=` on type `&isize`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0368`.
diff --git a/tests/ui/issues/issue-52489.stderr b/tests/ui/issues/issue-52489.stderr
index 842ebd196..442902bd1 100644
--- a/tests/ui/issues/issue-52489.stderr
+++ b/tests/ui/issues/issue-52489.stderr
@@ -6,6 +6,6 @@ LL | use issue_52489;
    |
    = help: add `#![feature(issue_52489_unstable)]` to the crate attributes to enable
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/issues/issue-52533.stderr b/tests/ui/issues/issue-52533.stderr
index c764736d7..8b56b36d3 100644
--- a/tests/ui/issues/issue-52533.stderr
+++ b/tests/ui/issues/issue-52533.stderr
@@ -7,5 +7,5 @@ LL |     foo(|a, b| b)
    |          |  has type `&'1 u32`
    |          has type `&'2 u32`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-52717.stderr b/tests/ui/issues/issue-52717.stderr
index 468cdf2dc..ab8c37225 100644
--- a/tests/ui/issues/issue-52717.stderr
+++ b/tests/ui/issues/issue-52717.stderr
@@ -7,6 +7,6 @@ LL |     A::A { fob } => { println!("{}", fob); }
    |            variant `A::A` does not have this field
    |            help: a field with a similar name exists: `foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0026`.
diff --git a/tests/ui/issues/issue-53300.stderr b/tests/ui/issues/issue-53300.stderr
index 2fedef7d2..293465ecb 100644
--- a/tests/ui/issues/issue-53300.stderr
+++ b/tests/ui/issues/issue-53300.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `Wrapper` in this scope
 LL | fn addition() -> Wrapper<impl A> {}
    |                  ^^^^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-53348.stderr b/tests/ui/issues/issue-53348.stderr
index e4cdb7e88..38fa98e65 100644
--- a/tests/ui/issues/issue-53348.stderr
+++ b/tests/ui/issues/issue-53348.stderr
@@ -7,6 +7,6 @@ LL |     for i in v {
 LL |         a = *i.to_string();
    |             ^^^^^^^^^^^^^^ expected `String`, found `str`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-53498.stderr b/tests/ui/issues/issue-53498.stderr
index b28fbff62..61a1aedf5 100644
--- a/tests/ui/issues/issue-53498.stderr
+++ b/tests/ui/issues/issue-53498.stderr
@@ -7,6 +7,6 @@ LL |         fn foo() {}
 LL |     test::Foo::<test::B>::foo();
    |                           ^^^ private associated function
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0624`.
diff --git a/tests/ui/issues/issue-5358-1.stderr b/tests/ui/issues/issue-5358-1.stderr
index 059462a36..1bb946ce4 100644
--- a/tests/ui/issues/issue-5358-1.stderr
+++ b/tests/ui/issues/issue-5358-1.stderr
@@ -17,6 +17,6 @@ help: you might have meant to use field `0` whose type is `Either<usize, usize>`
 LL |     match S(Either::Left(5)).0 {
    |           ~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-54062.stderr b/tests/ui/issues/issue-54062.stderr
index 5361ee1d3..75eef543f 100644
--- a/tests/ui/issues/issue-54062.stderr
+++ b/tests/ui/issues/issue-54062.stderr
@@ -4,6 +4,6 @@ error[E0616]: field `inner` of struct `Mutex` is private
 LL |     let _ = test.comps.inner.try_lock();
    |                        ^^^^^ private field
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0616`.
diff --git a/tests/ui/issues/issue-5439.stderr b/tests/ui/issues/issue-5439.stderr
index a91e4b31f..6d1d74e30 100644
--- a/tests/ui/issues/issue-5439.stderr
+++ b/tests/ui/issues/issue-5439.stderr
@@ -6,6 +6,6 @@ LL |         return Box::new(Foo { nonexistent: self, foo: i });
    |
    = note: all struct fields are already assigned
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0560`.
diff --git a/tests/ui/issues/issue-54410.stderr b/tests/ui/issues/issue-54410.stderr
index 516c59afb..97e599075 100644
--- a/tests/ui/issues/issue-54410.stderr
+++ b/tests/ui/issues/issue-54410.stderr
@@ -6,6 +6,6 @@ LL |     pub static mut symbol: [i8];
    |
    = help: the trait `Sized` is not implemented for `[i8]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-5554.rs b/tests/ui/issues/issue-5554.rs
index 7737536f4..afe333ed7 100644
--- a/tests/ui/issues/issue-5554.rs
+++ b/tests/ui/issues/issue-5554.rs
@@ -2,7 +2,6 @@
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
-use std::default::Default;
 
 pub struct X<T> {
     a: T,
diff --git a/tests/ui/issues/issue-55587.stderr b/tests/ui/issues/issue-55587.stderr
index faf78cfe8..eec6426a2 100644
--- a/tests/ui/issues/issue-55587.stderr
+++ b/tests/ui/issues/issue-55587.stderr
@@ -6,6 +6,6 @@ LL |     let Path::new();
    |
    = help: for more information, visit https://doc.rust-lang.org/book/ch18-00-patterns.html
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0164`.
diff --git a/tests/ui/issues/issue-55731.stderr b/tests/ui/issues/issue-55731.stderr
index 97fd6678c..2c3804164 100644
--- a/tests/ui/issues/issue-55731.stderr
+++ b/tests/ui/issues/issue-55731.stderr
@@ -10,5 +10,5 @@ LL | |     });
    = note: `DistributedIteratorMulti<&'0 ()>` would have to be implemented for the type `Cloned<&()>`, for any lifetime `'0`...
    = note: ...but `DistributedIteratorMulti<&'1 ()>` is actually implemented for the type `Cloned<&'1 ()>`, for some specific lifetime `'1`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-56806.stderr b/tests/ui/issues/issue-56806.stderr
index f164fd0c5..f3d4c2fef 100644
--- a/tests/ui/issues/issue-56806.stderr
+++ b/tests/ui/issues/issue-56806.stderr
@@ -7,6 +7,6 @@ LL |     fn dyn_instead_of_self(self: Box<dyn Trait>);
    = note: type of `self` must be `Self` or a type that dereferences to it
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0307`.
diff --git a/tests/ui/issues/issue-56943.stderr b/tests/ui/issues/issue-56943.stderr
index c394e620b..60a2e92dc 100644
--- a/tests/ui/issues/issue-56943.stderr
+++ b/tests/ui/issues/issue-56943.stderr
@@ -6,6 +6,6 @@ LL |     let _: issue_56943::S = issue_56943::S2;
    |            |
    |            expected due to this
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-57271.stderr b/tests/ui/issues/issue-57271.stderr
index 391e69c91..10cbb34ef 100644
--- a/tests/ui/issues/issue-57271.stderr
+++ b/tests/ui/issues/issue-57271.stderr
@@ -22,6 +22,6 @@ LL |     Base(BaseType),
 LL ~     Object(Box<ObjectType>),
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0072`.
diff --git a/tests/ui/issues/issue-57362-1.stderr b/tests/ui/issues/issue-57362-1.stderr
index b10273f14..79b1b131a 100644
--- a/tests/ui/issues/issue-57362-1.stderr
+++ b/tests/ui/issues/issue-57362-1.stderr
@@ -11,6 +11,6 @@ note: `Trait` defines an item `f`, perhaps you need to implement it
 LL | trait Trait {
    | ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-57362-2.stderr b/tests/ui/issues/issue-57362-2.stderr
index 37beb587d..57477f534 100644
--- a/tests/ui/issues/issue-57362-2.stderr
+++ b/tests/ui/issues/issue-57362-2.stderr
@@ -13,6 +13,6 @@ note: `X` defines an item `make_g`, perhaps you need to implement it
 LL | trait X {
    | ^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-57924.stderr b/tests/ui/issues/issue-57924.stderr
index 0323a4dfb..40435fd0f 100644
--- a/tests/ui/issues/issue-57924.stderr
+++ b/tests/ui/issues/issue-57924.stderr
@@ -6,6 +6,6 @@ LL |         Self::<E>(e)
    |         |
    |         not allowed on self constructor
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0109`.
diff --git a/tests/ui/issues/issue-5844.mir.stderr b/tests/ui/issues/issue-5844.mir.stderr
index 6134d6889..4434f5a0f 100644
--- a/tests/ui/issues/issue-5844.mir.stderr
+++ b/tests/ui/issues/issue-5844.mir.stderr
@@ -6,6 +6,6 @@ LL |     issue_5844_aux::rand();
    |
    = note: consult the function's documentation for information on how to avoid undefined behavior
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/issues/issue-5844.thir.stderr b/tests/ui/issues/issue-5844.thir.stderr
index 310a2b593..6074f7d0e 100644
--- a/tests/ui/issues/issue-5844.thir.stderr
+++ b/tests/ui/issues/issue-5844.thir.stderr
@@ -6,6 +6,6 @@ LL |     issue_5844_aux::rand();
    |
    = note: consult the function's documentation for information on how to avoid undefined behavior
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0133`.
diff --git a/tests/ui/issues/issue-58463.rs b/tests/ui/issues/issue-58463.rs
index af93f7622..9573c9b70 100644
--- a/tests/ui/issues/issue-58463.rs
+++ b/tests/ui/issues/issue-58463.rs
@@ -1,6 +1,5 @@
 // run-pass
 // compile-flags:-C debuginfo=2
-// ignore-asmjs wasm2js does not support source maps yet
 
 fn foo() -> impl Copy {
     foo
diff --git a/tests/ui/issues/issue-58734.stderr b/tests/ui/issues/issue-58734.stderr
index d2314626d..5ae1ec7ca 100644
--- a/tests/ui/issues/issue-58734.stderr
+++ b/tests/ui/issues/issue-58734.stderr
@@ -18,6 +18,6 @@ error[E0599]: no function or associated item named `nonexistent` found for trait
 LL |     Trait::nonexistent(());
    |            ^^^^^^^^^^^ function or associated item not found in `dyn Trait`
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-5883.stderr b/tests/ui/issues/issue-5883.stderr
index a3e2531b5..51d9708e0 100644
--- a/tests/ui/issues/issue-5883.stderr
+++ b/tests/ui/issues/issue-5883.stderr
@@ -15,6 +15,6 @@ help: function arguments must have a statically known size, borrowed types alway
 LL |     r: &dyn A + 'static
    |        +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-58857.stderr b/tests/ui/issues/issue-58857.stderr
index 6aef35f0b..ac70bc725 100644
--- a/tests/ui/issues/issue-58857.stderr
+++ b/tests/ui/issues/issue-58857.stderr
@@ -4,5 +4,5 @@ error: negative bounds are not supported
 LL | impl<A: !Valid> Conj<A>{}
    |         ^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-59494.stderr b/tests/ui/issues/issue-59494.stderr
index e9a4bf967..960de1be2 100644
--- a/tests/ui/issues/issue-59494.stderr
+++ b/tests/ui/issues/issue-59494.stderr
@@ -13,6 +13,6 @@ note: required by a bound in `t8n`
 LL | fn t8n<A, B, C>(f: impl Fn(A) -> B, g: impl Fn(A) -> C) -> impl Fn(A) -> (B, C)
    |                                             ^^^^^^^^^^ required by this bound in `t8n`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-59756.stderr b/tests/ui/issues/issue-59756.stderr
index 9066e57aa..27c07fecd 100644
--- a/tests/ui/issues/issue-59756.stderr
+++ b/tests/ui/issues/issue-59756.stderr
@@ -15,6 +15,6 @@ help: try using a variant of the expected enum
 LL |     Ok(foo()?)
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-5997-enum.stderr b/tests/ui/issues/issue-5997-enum.stderr
index d07258ea7..c0b3cd6de 100644
--- a/tests/ui/issues/issue-5997-enum.stderr
+++ b/tests/ui/issues/issue-5997-enum.stderr
@@ -8,6 +8,6 @@ LL |     enum E { V(Z) }
    |           |
    |           help: try introducing a local generic parameter here: `<Z>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0401`.
diff --git a/tests/ui/issues/issue-5997-struct.stderr b/tests/ui/issues/issue-5997-struct.stderr
index 83229e02c..670a54894 100644
--- a/tests/ui/issues/issue-5997-struct.stderr
+++ b/tests/ui/issues/issue-5997-struct.stderr
@@ -8,6 +8,6 @@ LL |     struct S(T);
    |             |
    |             help: try introducing a local generic parameter here: `<T>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0401`.
diff --git a/tests/ui/issues/issue-60218.stderr b/tests/ui/issues/issue-60218.stderr
index ae3c4d120..b9317621b 100644
--- a/tests/ui/issues/issue-60218.stderr
+++ b/tests/ui/issues/issue-60218.stderr
@@ -20,6 +20,6 @@ LL | pub fn trigger_error<I, F>(iterable: I, functor: F)
 LL | for<'t> <Map<<&'t I as IntoIterator>::IntoIter, F> as Iterator>::Item: Foo,
    |                                                                        ^^^ required by this bound in `trigger_error`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-61106.stderr b/tests/ui/issues/issue-61106.stderr
index aa922e268..f825141fa 100644
--- a/tests/ui/issues/issue-61106.stderr
+++ b/tests/ui/issues/issue-61106.stderr
@@ -16,6 +16,6 @@ help: consider borrowing here
 LL |     foo(&x.clone());
    |         +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-61108.stderr b/tests/ui/issues/issue-61108.stderr
index dd87b6266..d018986ef 100644
--- a/tests/ui/issues/issue-61108.stderr
+++ b/tests/ui/issues/issue-61108.stderr
@@ -16,6 +16,6 @@ help: consider iterating over a slice of the `Vec<char>`'s content to avoid movi
 LL |     for l in &bad_letters {
    |              +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-61623.stderr b/tests/ui/issues/issue-61623.stderr
index bedea3890..be6e28edf 100644
--- a/tests/ui/issues/issue-61623.stderr
+++ b/tests/ui/issues/issue-61623.stderr
@@ -9,6 +9,6 @@ help: consider changing this to be a mutable reference
 LL | fn f3<'a>(x: &'a mut ((), &'a mut ())) {
    |                  +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0596`.
diff --git a/tests/ui/issues/issue-62375.stderr b/tests/ui/issues/issue-62375.stderr
index f6d7968c0..8750fbcf4 100644
--- a/tests/ui/issues/issue-62375.stderr
+++ b/tests/ui/issues/issue-62375.stderr
@@ -21,6 +21,6 @@ help: use parentheses to construct this tuple variant
 LL |     a == A::Value(/* () */);
    |                  ++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.
diff --git a/tests/ui/issues/issue-64430.stderr b/tests/ui/issues/issue-64430.stderr
index b6b1f3a66..1c8e020e9 100644
--- a/tests/ui/issues/issue-64430.stderr
+++ b/tests/ui/issues/issue-64430.stderr
@@ -7,6 +7,6 @@ LL | pub struct Foo;
 LL |     Foo.bar()
    |         ^^^ method not found in `Foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-64559.stderr b/tests/ui/issues/issue-64559.stderr
index 386ac794d..0cab37553 100644
--- a/tests/ui/issues/issue-64559.stderr
+++ b/tests/ui/issues/issue-64559.stderr
@@ -17,6 +17,6 @@ help: consider iterating over a slice of the `Vec<bool>`'s content to avoid movi
 LL |     for _val in &orig {}
    |                 +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr b/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr
index 2ec151d24..7fc414602 100644
--- a/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr
+++ b/tests/ui/issues/issue-64792-bad-unicode-ctor.stderr
@@ -7,6 +7,6 @@ LL |
 LL | const Y: X = X("ö");
    |              ^^^^^^ help: use struct literal syntax instead: `X {}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0423`.
diff --git a/tests/ui/issues/issue-65131.stderr b/tests/ui/issues/issue-65131.stderr
index e234e6da5..70e85b584 100644
--- a/tests/ui/issues/issue-65131.stderr
+++ b/tests/ui/issues/issue-65131.stderr
@@ -7,6 +7,6 @@ LL |     get_pair(&mut x, &mut x);
    |     |        first mutable borrow occurs here
    |     first borrow later used by call
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0499`.
diff --git a/tests/ui/issues/issue-65230.stderr b/tests/ui/issues/issue-65230.stderr
index 7ccab8894..c959658c0 100644
--- a/tests/ui/issues/issue-65230.stderr
+++ b/tests/ui/issues/issue-65230.stderr
@@ -13,6 +13,6 @@ LL | impl T1 for &dyn T2 {}
    |             ^
    = note: ...does not necessarily outlive the static lifetime
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
index 4af3672ef..d4266814a 100644
--- a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
+++ b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2015.stderr
@@ -23,6 +23,6 @@ help: disambiguate the method for candidate #2
 LL |     await::r#struct(&r#fn {});
    |     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0034`.
diff --git a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
index 2b96a0fb5..fe104bfe4 100644
--- a/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
+++ b/tests/ui/issues/issue-65634-raw-ident-suggestion.edition2018.stderr
@@ -23,6 +23,6 @@ help: disambiguate the method for candidate #2
 LL |     r#await::r#struct(&r#fn {});
    |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0034`.
diff --git a/tests/ui/issues/issue-6596-2.stderr b/tests/ui/issues/issue-6596-2.stderr
index 4fa73a464..e6281eb54 100644
--- a/tests/ui/issues/issue-6596-2.stderr
+++ b/tests/ui/issues/issue-6596-2.stderr
@@ -9,5 +9,5 @@ LL |     g!(foo);
    |
    = note: this error originates in the macro `g` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-66706.stderr b/tests/ui/issues/issue-66706.stderr
index 8a30c0cad..ffdd61e77 100644
--- a/tests/ui/issues/issue-66706.stderr
+++ b/tests/ui/issues/issue-66706.stderr
@@ -24,7 +24,9 @@ error: expected identifier, found reserved identifier `_`
   --> $DIR/issue-66706.rs:18:26
    |
 LL |     [0; match [|f @ &ref _| () ] {} ]
-   |                          ^ expected identifier, found reserved identifier
+   |         -----            ^ expected identifier, found reserved identifier
+   |         |
+   |         while parsing this `match` expression
 
 error[E0282]: type annotations needed
   --> $DIR/issue-66706.rs:2:11
diff --git a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr b/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
index 6fde44eaf..1ea2d48b4 100644
--- a/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
+++ b/tests/ui/issues/issue-67039-unsound-pin-partialeq.stderr
@@ -8,6 +8,6 @@ LL |     let _ = Pin::new(Apple) == Rc::pin(Apple);
               found struct `Rc<Apple>`
    = note: required for `Pin<Apple>` to implement `PartialEq<Pin<Rc<Apple>>>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0271`.
diff --git a/tests/ui/issues/issue-6738.stderr b/tests/ui/issues/issue-6738.stderr
index f97d899c2..9c25c0fd9 100644
--- a/tests/ui/issues/issue-6738.stderr
+++ b/tests/ui/issues/issue-6738.stderr
@@ -11,6 +11,6 @@ help: consider restricting type parameter `T`
 LL | impl<T: std::ops::AddAssign> Foo<T> {
    |       +++++++++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0368`.
diff --git a/tests/ui/issues/issue-67552.polonius.stderr b/tests/ui/issues/issue-67552.polonius.stderr
index 9ab77d344..ca42f87e8 100644
--- a/tests/ui/issues/issue-67552.polonius.stderr
+++ b/tests/ui/issues/issue-67552.polonius.stderr
@@ -13,5 +13,5 @@ LL | |     T: Iterator,
    | |________________^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-67552.polonius/issue-67552.long-type.txt'
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-67552.rs b/tests/ui/issues/issue-67552.rs
index 7336b873d..ec1997ccd 100644
--- a/tests/ui/issues/issue-67552.rs
+++ b/tests/ui/issues/issue-67552.rs
@@ -1,7 +1,6 @@
 // build-fail
 // compile-flags: -Copt-level=0
 // normalize-stderr-test: ".nll/" -> "/"
-// ignore-compare-mode-next-solver (hangs)
 
 fn main() {
     rec(Empty);
diff --git a/tests/ui/issues/issue-67552.stderr b/tests/ui/issues/issue-67552.stderr
index f93ed67da..1a8d7248b 100644
--- a/tests/ui/issues/issue-67552.stderr
+++ b/tests/ui/issues/issue-67552.stderr
@@ -1,11 +1,11 @@
 error: reached the recursion limit while instantiating `rec::<&mut &mut &mut &mut &mut ...>`
-  --> $DIR/issue-67552.rs:30:9
+  --> $DIR/issue-67552.rs:29:9
    |
 LL |         rec(identity(&mut it))
    |         ^^^^^^^^^^^^^^^^^^^^^^
    |
 note: `rec` defined here
-  --> $DIR/issue-67552.rs:23:1
+  --> $DIR/issue-67552.rs:22:1
    |
 LL | / fn rec<T>(mut it: T)
 LL | | where
@@ -13,5 +13,5 @@ LL | |     T: Iterator,
    | |________________^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-67552/issue-67552.long-type.txt'
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-70381.stderr b/tests/ui/issues/issue-70381.stderr
index 96b8e6569..298a1cf9e 100644
--- a/tests/ui/issues/issue-70381.stderr
+++ b/tests/ui/issues/issue-70381.stderr
@@ -4,5 +4,5 @@ error: 1 positional argument in format string, but no arguments were given
 LL |   println!("\r¡{}")
    |                ^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-7044.stderr b/tests/ui/issues/issue-7044.stderr
index 2ad67ec23..9d1fb3a10 100644
--- a/tests/ui/issues/issue-7044.stderr
+++ b/tests/ui/issues/issue-7044.stderr
@@ -8,6 +8,6 @@ LL | struct X;
    |
    = note: `X` must be defined only once in the value namespace of this module
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0428`.
diff --git a/tests/ui/issues/issue-7061.stderr b/tests/ui/issues/issue-7061.stderr
index a209f8a42..4fca2ff39 100644
--- a/tests/ui/issues/issue-7061.stderr
+++ b/tests/ui/issues/issue-7061.stderr
@@ -9,6 +9,6 @@ LL |     fn foo(&'a mut self) -> Box<BarStruct> { self }
    = note:         expected struct `Box<BarStruct>`
            found mutable reference `&'a mut BarStruct`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-7092.stderr b/tests/ui/issues/issue-7092.stderr
index e35379fd1..e2e574867 100644
--- a/tests/ui/issues/issue-7092.stderr
+++ b/tests/ui/issues/issue-7092.stderr
@@ -9,6 +9,6 @@ LL |         Some(field) =>
    = note: expected enum `Whatever`
               found enum `Option<_>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-71406.stderr b/tests/ui/issues/issue-71406.stderr
index 918163b60..cd7921f55 100644
--- a/tests/ui/issues/issue-71406.stderr
+++ b/tests/ui/issues/issue-71406.stderr
@@ -4,6 +4,6 @@ error[E0433]: failed to resolve: expected type, found function `channel` in `mps
 LL |     let (tx, rx) = mpsc::channel::new(1);
    |                          ^^^^^^^ expected type, found function `channel` in `mpsc`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0433`.
diff --git a/tests/ui/issues/issue-71676-2.stderr b/tests/ui/issues/issue-71676-2.stderr
index 80fb4aed1..6ed318c87 100644
--- a/tests/ui/issues/issue-71676-2.stderr
+++ b/tests/ui/issues/issue-71676-2.stderr
@@ -13,6 +13,6 @@ help: consider dereferencing
 LL |     let _: *mut u8 = &mut ***a;
    |                       +++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-72076.stderr b/tests/ui/issues/issue-72076.stderr
index b942cf75b..a08704c90 100644
--- a/tests/ui/issues/issue-72076.stderr
+++ b/tests/ui/issues/issue-72076.stderr
@@ -9,6 +9,6 @@ LL |     fn f() -> Self::S {}
    = help: consider constraining the associated type `<Self as X>::S` to `()` or calling a method that returns `<Self as X>::S`
    = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-7246.stderr b/tests/ui/issues/issue-7246.stderr
index a9bf2bf76..1fb6ab14e 100644
--- a/tests/ui/issues/issue-7246.stderr
+++ b/tests/ui/issues/issue-7246.stderr
@@ -20,5 +20,5 @@ LL |     if *ptr::null() {};
    |
    = note: `#[warn(deref_nullptr)]` on by default
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/ui/issues/issue-72839-error-overflow.stderr b/tests/ui/issues/issue-72839-error-overflow.stderr
index c4b6f90ca..35be632f5 100644
--- a/tests/ui/issues/issue-72839-error-overflow.stderr
+++ b/tests/ui/issues/issue-72839-error-overflow.stderr
@@ -4,6 +4,6 @@ error[E0425]: cannot find value `missing_var` in this scope
 LL |     if missing_var % 8 == 0 {}
    |        ^^^^^^^^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/issues/issue-73112.stderr b/tests/ui/issues/issue-73112.stderr
index 4b8b97966..c2c15ca10 100644
--- a/tests/ui/issues/issue-73112.stderr
+++ b/tests/ui/issues/issue-73112.stderr
@@ -10,6 +10,6 @@ note: `PageTable` has a `#[repr(align)]` attribute
 LL | pub struct PageTable {
    | ^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0588`.
diff --git a/tests/ui/issues/issue-7364.stderr b/tests/ui/issues/issue-7364.stderr
index 7449fe697..7371e2105 100644
--- a/tests/ui/issues/issue-7364.stderr
+++ b/tests/ui/issues/issue-7364.stderr
@@ -11,6 +11,6 @@ note: required because it appears within the type `Box<RefCell<isize>>`
   --> $SRC_DIR/alloc/src/boxed.rs:LL:COL
    = note: shared static variables must have a type that implements `Sync`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-74236/main.stderr b/tests/ui/issues/issue-74236/main.stderr
index 5cd64e48a..a31d29de1 100644
--- a/tests/ui/issues/issue-74236/main.stderr
+++ b/tests/ui/issues/issue-74236/main.stderr
@@ -6,6 +6,6 @@ LL |     let () = dep::Renamed;
    |         |
    |         expected `Renamed`, found `()`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-75283.stderr b/tests/ui/issues/issue-75283.stderr
index da3800aff..240d9716a 100644
--- a/tests/ui/issues/issue-75283.stderr
+++ b/tests/ui/issues/issue-75283.stderr
@@ -14,5 +14,5 @@ LL | |     }
    = help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
    = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-7607-1.stderr b/tests/ui/issues/issue-7607-1.stderr
index c98302699..db4c8f25d 100644
--- a/tests/ui/issues/issue-7607-1.stderr
+++ b/tests/ui/issues/issue-7607-1.stderr
@@ -7,6 +7,6 @@ LL | impl Fo {
    |
    = note: similarly named trait `Fn` defined here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-76077.stderr b/tests/ui/issues/issue-76077.stderr
index 197ca8d5a..3fef5ffce 100644
--- a/tests/ui/issues/issue-76077.stderr
+++ b/tests/ui/issues/issue-76077.stderr
@@ -4,7 +4,7 @@ error: cannot construct `Foo` with struct literal syntax due to private fields
 LL |     foo::Foo {};
    |     ^^^^^^^^
    |
-   = note: ... and other private field `you_cant_use_this_field` that was not provided
+   = note: private field `you_cant_use_this_field` that was not provided
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-77218/issue-77218-2.stderr b/tests/ui/issues/issue-77218/issue-77218-2.stderr
index 58c1c18f9..dfed0b6e6 100644
--- a/tests/ui/issues/issue-77218/issue-77218-2.stderr
+++ b/tests/ui/issues/issue-77218/issue-77218-2.stderr
@@ -11,6 +11,6 @@ help: you might have meant to use pattern destructuring
 LL |     while let Some(0) = value.get(0) {
    |           +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0070`.
diff --git a/tests/ui/issues/issue-77218/issue-77218.stderr b/tests/ui/issues/issue-77218/issue-77218.stderr
index eda635646..e98e69314 100644
--- a/tests/ui/issues/issue-77218/issue-77218.stderr
+++ b/tests/ui/issues/issue-77218/issue-77218.stderr
@@ -11,6 +11,6 @@ help: you might have meant to use pattern destructuring
 LL |     while let Some(0) = value.get(0) {}
    |           +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0070`.
diff --git a/tests/ui/issues/issue-78622.stderr b/tests/ui/issues/issue-78622.stderr
index 70daf8a2f..985d6dde9 100644
--- a/tests/ui/issues/issue-78622.stderr
+++ b/tests/ui/issues/issue-78622.stderr
@@ -9,6 +9,6 @@ help: if there were a trait named `Example` with associated type `A` implemented
 LL |     <S as Example>::A::<f> {}
    |     ~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0223`.
diff --git a/tests/ui/issues/issue-7867.stderr b/tests/ui/issues/issue-7867.stderr
index 4fb1af344..1a0cf5da8 100644
--- a/tests/ui/issues/issue-7867.stderr
+++ b/tests/ui/issues/issue-7867.stderr
@@ -12,6 +12,6 @@ LL |         A::B => (),
    = note: expected tuple `(bool, bool)`
                found enum `A`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-7950.stderr b/tests/ui/issues/issue-7950.stderr
index b8b0eb310..80504c070 100644
--- a/tests/ui/issues/issue-7950.stderr
+++ b/tests/ui/issues/issue-7950.stderr
@@ -7,6 +7,6 @@ LL | struct Foo;
 LL |     Foo::bar();
    |          ^^^ function or associated item not found in `Foo`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/issues/issue-7970a.stderr b/tests/ui/issues/issue-7970a.stderr
index b04a0eef3..1e6bb92ea 100644
--- a/tests/ui/issues/issue-7970a.stderr
+++ b/tests/ui/issues/issue-7970a.stderr
@@ -13,5 +13,5 @@ note: while trying to match meta-variable `$fmt:expr`
 LL |     ($fmt:expr) => (print!(concat!($fmt, "\n")));
    |      ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/issues/issue-80607.stderr b/tests/ui/issues/issue-80607.stderr
index 38e46683b..20494f319 100644
--- a/tests/ui/issues/issue-80607.stderr
+++ b/tests/ui/issues/issue-80607.stderr
@@ -12,6 +12,6 @@ help: `Enum::V1` is a tuple variant, use the appropriate syntax
 LL |     Enum::V1(/* fields */)
    |     ~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0559`.
diff --git a/tests/ui/issues/issue-81584.stderr b/tests/ui/issues/issue-81584.stderr
index d57f1b778..eb97916ad 100644
--- a/tests/ui/issues/issue-81584.stderr
+++ b/tests/ui/issues/issue-81584.stderr
@@ -9,6 +9,6 @@ LL |             .map(|y| y.iter().map(|x| x + 1))
    |
    = help: use `.collect()` to allocate the iterator
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0515`.
diff --git a/tests/ui/issues/issue-83048.stderr b/tests/ui/issues/issue-83048.stderr
index dade9e469..672bf69a7 100644
--- a/tests/ui/issues/issue-83048.stderr
+++ b/tests/ui/issues/issue-83048.stderr
@@ -4,6 +4,6 @@ error[E0268]: `break` outside of a loop or labeled block
 LL |     break;
    |     ^^^^^ cannot `break` outside of a loop or labeled block
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0268`.
diff --git a/tests/ui/issues/issue-87199.stderr b/tests/ui/issues/issue-87199.stderr
index e02cd7fcf..d81bc3615 100644
--- a/tests/ui/issues/issue-87199.stderr
+++ b/tests/ui/issues/issue-87199.stderr
@@ -33,6 +33,6 @@ help: consider relaxing the implicit `Sized` restriction
 LL | fn ref_arg<T: ?Send + ?Sized>(_: &T) {}
    |                     ++++++++
 
-error: aborting due to previous error; 3 warnings emitted
+error: aborting due to 1 previous error; 3 warnings emitted
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/issues/issue-8727.polonius.stderr b/tests/ui/issues/issue-8727.polonius.stderr
index 283c01b6b..4fb8c2b3a 100644
--- a/tests/ui/issues/issue-8727.polonius.stderr
+++ b/tests/ui/issues/issue-8727.polonius.stderr
@@ -22,5 +22,5 @@ LL | fn generic<T>() {
    | ^^^^^^^^^^^^^^^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-8727.polonius/issue-8727.long-type.txt'
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/ui/issues/issue-8727.stderr b/tests/ui/issues/issue-8727.stderr
index 22332b357..9af598fe4 100644
--- a/tests/ui/issues/issue-8727.stderr
+++ b/tests/ui/issues/issue-8727.stderr
@@ -22,5 +22,5 @@ LL | fn generic<T>() {
    | ^^^^^^^^^^^^^^^
    = note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-8727/issue-8727.long-type.txt'
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/ui/issues/issue-87490.stderr b/tests/ui/issues/issue-87490.stderr
index f359dd638..5a4ec5583 100644
--- a/tests/ui/issues/issue-87490.stderr
+++ b/tests/ui/issues/issue-87490.stderr
@@ -9,6 +9,6 @@ LL |     String::new
    = note: expected type `usize`
            found fn item `fn() -> String {String::new}`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-8767.stderr b/tests/ui/issues/issue-8767.stderr
index 91d99f393..66141628e 100644
--- a/tests/ui/issues/issue-8767.stderr
+++ b/tests/ui/issues/issue-8767.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `B` in this scope
 LL | impl B {
    |      ^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0412`.
diff --git a/tests/ui/issues/issue-8783.rs b/tests/ui/issues/issue-8783.rs
index 4eb49c821..cfffd9eb0 100644
--- a/tests/ui/issues/issue-8783.rs
+++ b/tests/ui/issues/issue-8783.rs
@@ -2,8 +2,6 @@
 #![allow(unused_variables)]
 // pretty-expanded FIXME #23616
 
-use std::default::Default;
-
 struct X { pub x: usize }
 impl Default for X {
     fn default() -> X {
diff --git a/tests/ui/issues/issue-9575.stderr b/tests/ui/issues/issue-9575.stderr
index e49eac3ba..2f6e2687d 100644
--- a/tests/ui/issues/issue-9575.stderr
+++ b/tests/ui/issues/issue-9575.stderr
@@ -7,6 +7,6 @@ LL | fn start(argc: isize, argv: *const *const u8, crate_map: *const u8) -> isiz
    = note: expected signature `fn(isize, *const *const u8) -> _`
               found signature `fn(isize, *const *const u8, *const u8) -> _`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-9814.stderr b/tests/ui/issues/issue-9814.stderr
index bd9e7df49..d647edaf3 100644
--- a/tests/ui/issues/issue-9814.stderr
+++ b/tests/ui/issues/issue-9814.stderr
@@ -4,6 +4,6 @@ error[E0614]: type `Foo` cannot be dereferenced
 LL |     let _ = *Foo::Bar(2);
    |             ^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0614`.
diff --git a/tests/ui/issues/issue-98299.stderr b/tests/ui/issues/issue-98299.stderr
index 4fd9f3030..e99d8e5cc 100644
--- a/tests/ui/issues/issue-98299.stderr
+++ b/tests/ui/issues/issue-98299.stderr
@@ -9,6 +9,6 @@ help: consider giving this closure parameter an explicit type, where the value o
 LL |     SmallCString::try_from(p).map(|cstr: SmallCString<N>| cstr);
    |                                        +++++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.