Merging upstream version 1.76.0+dfsg1.

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

49 files changed, 49 insertions, 49 deletions

diff --git a/tests/ui/span/E0046.stderr b/tests/ui/span/E0046.stderr
index 1323524f2..416873a42 100644
--- a/tests/ui/span/E0046.stderr
+++ b/tests/ui/span/E0046.stderr
@@ -7,6 +7,6 @@ LL |     fn foo();
 LL | impl Foo for Bar {}
    | ^^^^^^^^^^^^^^^^ missing `foo` in implementation
 
-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/span/E0072.stderr b/tests/ui/span/E0072.stderr
index 20f2e0df0..c8599b4eb 100644
--- a/tests/ui/span/E0072.stderr
+++ b/tests/ui/span/E0072.stderr
@@ -12,6 +12,6 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
 LL |     tail: Option<Box<ListNode>>,
    |                  ++++        +
 
-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/span/E0493.stderr b/tests/ui/span/E0493.stderr
index 9db627562..0f2e2d7b3 100644
--- a/tests/ui/span/E0493.stderr
+++ b/tests/ui/span/E0493.stderr
@@ -6,6 +6,6 @@ LL | const F : Foo = (Foo { a : 0 }, Foo { a : 1 }).1;
    |                 |
    |                 the destructor for this type cannot be evaluated in constants
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0493`.
diff --git a/tests/ui/span/E0535.stderr b/tests/ui/span/E0535.stderr
index b1411bc43..9060b687f 100644
--- a/tests/ui/span/E0535.stderr
+++ b/tests/ui/span/E0535.stderr
@@ -6,6 +6,6 @@ LL | #[inline(unknown)]
    |
    = help: valid inline arguments are `always` and `never`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0535`.
diff --git a/tests/ui/span/E0536.stderr b/tests/ui/span/E0536.stderr
index 820b0d744..b0f652208 100644
--- a/tests/ui/span/E0536.stderr
+++ b/tests/ui/span/E0536.stderr
@@ -4,6 +4,6 @@ error[E0536]: expected 1 cfg-pattern
 LL | #[cfg(not())]
    |       ^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0536`.
diff --git a/tests/ui/span/E0537.stderr b/tests/ui/span/E0537.stderr
index 5478c3fbc..4254d3893 100644
--- a/tests/ui/span/E0537.stderr
+++ b/tests/ui/span/E0537.stderr
@@ -4,6 +4,6 @@ error[E0537]: invalid predicate `unknown`
 LL | #[cfg(unknown())]
    |       ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0537`.
diff --git a/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
index 3f033f5e4..39e7279fb 100644
--- a/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
+++ b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -9,6 +9,6 @@ help: consider changing this to be a mutable reference
 LL | fn b(x: &mut Foo) {
    |          +++
 
-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/span/borrowck-fn-in-const-b.stderr b/tests/ui/span/borrowck-fn-in-const-b.stderr
index 929878026..d4a8ba269 100644
--- a/tests/ui/span/borrowck-fn-in-const-b.stderr
+++ b/tests/ui/span/borrowck-fn-in-const-b.stderr
@@ -9,6 +9,6 @@ help: consider changing this to be a mutable reference
 LL |     fn broken(x: &mut Vec<String>) {
    |                   +++
 
-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/span/borrowck-ref-into-rvalue.stderr b/tests/ui/span/borrowck-ref-into-rvalue.stderr
index 25e344fed..c0edeeae2 100644
--- a/tests/ui/span/borrowck-ref-into-rvalue.stderr
+++ b/tests/ui/span/borrowck-ref-into-rvalue.stderr
@@ -15,6 +15,6 @@ LL ~     let binding = Some("Hello".to_string());
 LL ~     match binding {
    |
 
-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/span/destructor-restrictions.stderr b/tests/ui/span/destructor-restrictions.stderr
index b923cee5f..a80a89fb6 100644
--- a/tests/ui/span/destructor-restrictions.stderr
+++ b/tests/ui/span/destructor-restrictions.stderr
@@ -20,6 +20,6 @@ help: for example, you could save the expression's value in a new local variable
 LL |         let x = *a.borrow() + 1; x
    |         +++++++                +++
 
-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/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
index 1ec8ca427..004a057bb 100644
--- a/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
@@ -4,5 +4,5 @@ error: this file contains an unclosed delimiter
 LL | trait C{async fn new(val: T) {}
    |        - unclosed delimiter                                                         ^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/span/dropck-object-cycle.stderr b/tests/ui/span/dropck-object-cycle.stderr
index 097fb6219..6e05f901a 100644
--- a/tests/ui/span/dropck-object-cycle.stderr
+++ b/tests/ui/span/dropck-object-cycle.stderr
@@ -12,6 +12,6 @@ LL | }
    | `*m` dropped here while still borrowed
    | borrow might be used here, when `m` is dropped and runs the destructor for type `Box<dyn Trait<'_>>`
 
-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/span/gated-features-attr-spans.stderr b/tests/ui/span/gated-features-attr-spans.stderr
index c8b8f346b..5376d7799 100644
--- a/tests/ui/span/gated-features-attr-spans.stderr
+++ b/tests/ui/span/gated-features-attr-spans.stderr
@@ -7,6 +7,6 @@ LL | #[repr(simd)]
    = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(repr_simd)]` 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/span/issue-11925.stderr b/tests/ui/span/issue-11925.stderr
index 1d317fc33..c7f957359 100644
--- a/tests/ui/span/issue-11925.stderr
+++ b/tests/ui/span/issue-11925.stderr
@@ -4,6 +4,6 @@ error[E0515]: cannot return reference to local data `x`
 LL |         let f = to_fn_once(move|| &x);
    |                                   ^^ 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/span/issue-15480.stderr b/tests/ui/span/issue-15480.stderr
index d9cce2254..45a5d7dfb 100644
--- a/tests/ui/span/issue-15480.stderr
+++ b/tests/ui/span/issue-15480.stderr
@@ -16,6 +16,6 @@ LL ~     let v = vec![
 LL ~         &binding
    |
 
-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/span/issue-23729.stderr b/tests/ui/span/issue-23729.stderr
index cd854e61f..6baec60d5 100644
--- a/tests/ui/span/issue-23729.stderr
+++ b/tests/ui/span/issue-23729.stderr
@@ -6,6 +6,6 @@ LL |         impl Iterator for Recurrence {
    |
    = help: implement the missing item: `type Item = /* Type */;`
 
-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/span/issue-23827.stderr b/tests/ui/span/issue-23827.stderr
index 83a9e8c9b..fe7c7794c 100644
--- a/tests/ui/span/issue-23827.stderr
+++ b/tests/ui/span/issue-23827.stderr
@@ -6,6 +6,6 @@ LL | impl<C: Component> FnOnce<(C,)> for Prototype {
    |
    = help: implement the missing item: `type Output = /* Type */;`
 
-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/span/issue-24356.stderr b/tests/ui/span/issue-24356.stderr
index cf666e8b4..609991f2b 100644
--- a/tests/ui/span/issue-24356.stderr
+++ b/tests/ui/span/issue-24356.stderr
@@ -6,6 +6,6 @@ LL |         impl Deref for Thing {
    |
    = help: implement the missing item: `type Target = /* Type */;`
 
-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/span/issue-24805-dropck-child-has-items-via-parent.stderr b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
index c3b6d7580..f7564f8c7 100644
--- a/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
+++ b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
@@ -15,6 +15,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/issue-24895-copy-clone-dropck.stderr b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
index 83db4d509..2252a241b 100644
--- a/tests/ui/span/issue-24895-copy-clone-dropck.stderr
+++ b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
@@ -14,6 +14,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/issue-25199.stderr b/tests/ui/span/issue-25199.stderr
index 1e0276f0c..7a6910065 100644
--- a/tests/ui/span/issue-25199.stderr
+++ b/tests/ui/span/issue-25199.stderr
@@ -12,6 +12,6 @@ LL | }
    | `container` dropped here while still borrowed
    | borrow might be used here, when `container` is dropped and runs the destructor for type `Container<'_>`
 
-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/span/issue-26656.stderr b/tests/ui/span/issue-26656.stderr
index fea6e0012..586eca254 100644
--- a/tests/ui/span/issue-26656.stderr
+++ b/tests/ui/span/issue-26656.stderr
@@ -14,6 +14,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/issue-27522.stderr b/tests/ui/span/issue-27522.stderr
index 8a254a968..c2de15628 100644
--- a/tests/ui/span/issue-27522.stderr
+++ b/tests/ui/span/issue-27522.stderr
@@ -7,6 +7,6 @@ LL |     fn handler(self: &SomeType);
    = 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/span/issue-29595.stderr b/tests/ui/span/issue-29595.stderr
index 7d603cdbf..c78287546 100644
--- a/tests/ui/span/issue-29595.stderr
+++ b/tests/ui/span/issue-29595.stderr
@@ -10,6 +10,6 @@ help: this trait has no implementations, consider adding one
 LL | trait Tr {
    | ^^^^^^^^
 
-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/span/issue-33884.stderr b/tests/ui/span/issue-33884.stderr
index 8cece07cd..29490d86f 100644
--- a/tests/ui/span/issue-33884.stderr
+++ b/tests/ui/span/issue-33884.stderr
@@ -6,6 +6,6 @@ LL |     stream.write_fmt(format!("message received"))
    |
    = note: this error originates in the macro `format` (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/span/issue-35987.stderr b/tests/ui/span/issue-35987.stderr
index 88c86d2a9..4c4b100da 100644
--- a/tests/ui/span/issue-35987.stderr
+++ b/tests/ui/span/issue-35987.stderr
@@ -14,6 +14,6 @@ help: consider importing this trait instead
 LL + use std::ops::Add;
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0404`.
diff --git a/tests/ui/span/issue-36537.stderr b/tests/ui/span/issue-36537.stderr
index 8dfee8d64..eeb4e9a0e 100644
--- a/tests/ui/span/issue-36537.stderr
+++ b/tests/ui/span/issue-36537.stderr
@@ -11,6 +11,6 @@ LL |     }
 LL |     p.use_ref();
    |     - 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 E0597`.
diff --git a/tests/ui/span/issue-40157.stderr b/tests/ui/span/issue-40157.stderr
index 216876717..7b2ce292c 100644
--- a/tests/ui/span/issue-40157.stderr
+++ b/tests/ui/span/issue-40157.stderr
@@ -7,6 +7,6 @@ LL |     {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x }
    |                                   |                 borrowed value does not live long enough
    |                                   binding `foo` declared here
 
-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/span/issue28498-reject-ex1.stderr b/tests/ui/span/issue28498-reject-ex1.stderr
index 86e2d8c56..7b8af23a6 100644
--- a/tests/ui/span/issue28498-reject-ex1.stderr
+++ b/tests/ui/span/issue28498-reject-ex1.stderr
@@ -12,6 +12,6 @@ LL | }
    |
    = note: consider using a `let` binding to create a longer lived value
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0713`.
diff --git a/tests/ui/span/issue28498-reject-lifetime-param.stderr b/tests/ui/span/issue28498-reject-lifetime-param.stderr
index 94c450c7b..4b66dc76c 100644
--- a/tests/ui/span/issue28498-reject-lifetime-param.stderr
+++ b/tests/ui/span/issue28498-reject-lifetime-param.stderr
@@ -15,6 +15,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/issue28498-reject-passed-to-fn.stderr b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
index e133f75d5..fe43657bd 100644
--- a/tests/ui/span/issue28498-reject-passed-to-fn.stderr
+++ b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
@@ -15,6 +15,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/issue28498-reject-trait-bound.stderr b/tests/ui/span/issue28498-reject-trait-bound.stderr
index 9ab3cdd13..aafa29e5e 100644
--- a/tests/ui/span/issue28498-reject-trait-bound.stderr
+++ b/tests/ui/span/issue28498-reject-trait-bound.stderr
@@ -15,6 +15,6 @@ LL | }
    |
    = note: values in a scope are dropped in the opposite order they are defined
 
-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/span/move-closure.stderr b/tests/ui/span/move-closure.stderr
index 2127b8202..2e9cef32e 100644
--- a/tests/ui/span/move-closure.stderr
+++ b/tests/ui/span/move-closure.stderr
@@ -13,6 +13,6 @@ help: use parentheses to call this closure
 LL |     let x: () = (move || ())();
    |                 +          +++
 
-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/span/multiline-span-E0072.stderr b/tests/ui/span/multiline-span-E0072.stderr
index fc2f6e662..9e675d56e 100644
--- a/tests/ui/span/multiline-span-E0072.stderr
+++ b/tests/ui/span/multiline-span-E0072.stderr
@@ -13,6 +13,6 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
 LL |     tail: Option<Box<ListNode>>,
    |                  ++++        +
 
-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/span/multiline-span-simple.stderr b/tests/ui/span/multiline-span-simple.stderr
index b6052a209..f0eec632a 100644
--- a/tests/ui/span/multiline-span-simple.stderr
+++ b/tests/ui/span/multiline-span-simple.stderr
@@ -11,6 +11,6 @@ LL |     foo(1 as u32 +
              <&'a u32 as Add<u32>>
              <&u32 as Add<&u32>>
 
-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/span/mut-ptr-cant-outlive-ref.stderr b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
index 395b6ec67..1624b80e7 100644
--- a/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
+++ b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
@@ -11,6 +11,6 @@ LL |
 LL |     p.use_ref();
    |     - 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 E0597`.
diff --git a/tests/ui/span/non-existing-module-import.stderr b/tests/ui/span/non-existing-module-import.stderr
index 25c099590..7da9e32b3 100644
--- a/tests/ui/span/non-existing-module-import.stderr
+++ b/tests/ui/span/non-existing-module-import.stderr
@@ -4,6 +4,6 @@ error[E0432]: unresolved import `std::bar`
 LL | use std::bar::{foo1, foo2};
    |          ^^^ could not find `bar` in `std`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/span/recursive-type-field.stderr b/tests/ui/span/recursive-type-field.stderr
index 10af4c36b..30ba8cde4 100644
--- a/tests/ui/span/recursive-type-field.stderr
+++ b/tests/ui/span/recursive-type-field.stderr
@@ -22,6 +22,6 @@ LL | struct Bar<'a> {
 LL ~     y: (Box<Foo<'a>>, Box<Foo<'a>>),
    |
 
-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/span/regionck-unboxed-closure-lifetimes.stderr b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
index 9b5ec8461..225f83b6e 100644
--- a/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
+++ b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
@@ -11,6 +11,6 @@ LL |     }
 LL |     f.use_mut();
    |     - 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 E0597`.
diff --git a/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
index 81e858fa0..b7ca491f2 100644
--- a/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
+++ b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
@@ -11,6 +11,6 @@ LL | }
    |
    = note: consider using a `let` binding to create a longer lived value
 
-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/span/regions-close-over-type-parameter-2.stderr b/tests/ui/span/regions-close-over-type-parameter-2.stderr
index fed40a4fd..3849b9eef 100644
--- a/tests/ui/span/regions-close-over-type-parameter-2.stderr
+++ b/tests/ui/span/regions-close-over-type-parameter-2.stderr
@@ -10,6 +10,6 @@ LL |         repeater3(tmp1)
 LL |     };
    |     - `tmp0` 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/span/regions-escape-loop-via-variable.stderr b/tests/ui/span/regions-escape-loop-via-variable.stderr
index e5c7d8b26..e32cc10c0 100644
--- a/tests/ui/span/regions-escape-loop-via-variable.stderr
+++ b/tests/ui/span/regions-escape-loop-via-variable.stderr
@@ -10,6 +10,6 @@ LL |         p = &x;
 LL |     }
    |     - `x` 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/span/regions-infer-borrow-scope-within-loop.stderr b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
index 47931db84..746be0456 100644
--- a/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
+++ b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
@@ -12,6 +12,6 @@ LL |     }
 LL |     assert!(*y != 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 E0597`.
diff --git a/tests/ui/span/slice-borrow.stderr b/tests/ui/span/slice-borrow.stderr
index b271c9ae6..48ac20fee 100644
--- a/tests/ui/span/slice-borrow.stderr
+++ b/tests/ui/span/slice-borrow.stderr
@@ -12,6 +12,6 @@ LL |     y.use_ref();
    = note: consider using a `let` binding to create a longer lived value
    = 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 E0716`.
diff --git a/tests/ui/span/suggestion-non-ascii.stderr b/tests/ui/span/suggestion-non-ascii.stderr
index 21f8bb62a..6e6e31a56 100644
--- a/tests/ui/span/suggestion-non-ascii.stderr
+++ b/tests/ui/span/suggestion-non-ascii.stderr
@@ -4,6 +4,6 @@ error[E0608]: cannot index into a value of type `({integer},)`
 LL |     println!("☃{}", tup[0]);
    |                        ^^^ help: to access tuple elements, use: `.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/span/transitive-dep-span.stderr b/tests/ui/span/transitive-dep-span.stderr
index 4dc3e5721..c0f3f3a65 100644
--- a/tests/ui/span/transitive-dep-span.stderr
+++ b/tests/ui/span/transitive-dep-span.stderr
@@ -14,5 +14,5 @@ LL | transitive_dep_two::parse_error!();
    | in this macro invocation
    | in this macro invocation
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/span/type-annotations-needed-expr.stderr b/tests/ui/span/type-annotations-needed-expr.stderr
index 65a90318a..a548df052 100644
--- a/tests/ui/span/type-annotations-needed-expr.stderr
+++ b/tests/ui/span/type-annotations-needed-expr.stderr
@@ -9,6 +9,6 @@ help: consider specifying the generic argument
 LL |     let _ = (vec![1,2,3]).into_iter().sum::<S>() as f64;
    |                                          +++++
 
-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/span/type-binding.stderr b/tests/ui/span/type-binding.stderr
index cb0aefe06..5df74fa2f 100644
--- a/tests/ui/span/type-binding.stderr
+++ b/tests/ui/span/type-binding.stderr
@@ -4,6 +4,6 @@ error[E0220]: associated type `Trget` not found for `Deref`
 LL | fn homura<T: Deref<Trget = i32>>(_: T) {}
    |                    ^^^^^ help: there is an associated type with a similar name: `Target`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0220`.
diff --git a/tests/ui/span/wf-method-late-bound-regions.stderr b/tests/ui/span/wf-method-late-bound-regions.stderr
index 64c2d0f16..09d6714e7 100644
--- a/tests/ui/span/wf-method-late-bound-regions.stderr
+++ b/tests/ui/span/wf-method-late-bound-regions.stderr
@@ -10,6 +10,6 @@ LL |         f2.xmute(&pointer)
 LL |     };
    |     - `pointer` 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`.