Manual find replace updates

2023-11-21 20:26:31 +01:00 · 2023-11-21 20:26:31 +01:00 · 9b80d85722
commit 9b80d85722
parent 377da2f06b
59 changed files with 59 additions and 59 deletions
--- a/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr
+++ b/src/tools/clippy/tests/ui-internal/default_deprecation_reason.stderr
@ -18,5 +18,5 @@ LL | #![deny(clippy::internal)]
   = note: `#[deny(clippy::default_deprecation_reason)]` implied by `#[deny(clippy::internal)]`
   = note: this error originates in the macro `declare_deprecated_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/clippy/tests/ui-internal/default_lint.stderr
+++ b/src/tools/clippy/tests/ui-internal/default_lint.stderr
@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
   = note: `#[deny(clippy::default_lint)]` implied by `#[deny(clippy::internal)]`
   = note: this error originates in the macro `$crate::declare_tool_lint` which comes from the expansion of the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr
+++ b/src/tools/clippy/tests/ui-internal/lint_without_lint_pass.stderr
@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
   = note: `#[deny(clippy::lint_without_lint_pass)]` implied by `#[deny(clippy::internal)]`
   = note: this error originates in the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
+++ b/src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
@ -11,5 +11,5 @@ LL | #![deny(clippy::internal)]
   |         ^^^^^^^^^^^^^^^^
   = note: `#[deny(clippy::outer_expn_expn_data)]` implied by `#[deny(clippy::internal)]`

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/concurrency/read_only_atomic_load_large.stderr
+++ b/src/tools/miri/tests/fail/concurrency/read_only_atomic_load_large.stderr
@ -15,5 +15,5 @@ see <https://doc.rust-lang.org/nightly/std/sync/atomic/index.html#atomic-accesse

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/concurrency/windows_join_detached.stderr
+++ b/src/tools/miri/tests/fail/concurrency/windows_join_detached.stderr
@ -18,5 +18,5 @@ LL |     thread.join().unwrap();

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/concurrency/windows_join_main.stderr
+++ b/src/tools/miri/tests/fail/concurrency/windows_join_main.stderr
@ -9,5 +9,5 @@ LL |             assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), 0);

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/concurrency/windows_join_self.stderr
+++ b/src/tools/miri/tests/fail/concurrency/windows_join_self.stderr
@ -8,5 +8,5 @@ LL |             assert_eq!(WaitForSingleObject(native, INFINITE), 0);

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/memleak_rc.32bit.stderr
+++ b/src/tools/miri/tests/fail/memleak_rc.32bit.stderr
@ -20,5 +20,5 @@ note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a

 note: the evaluated program leaked memory, pass `-Zmiri-ignore-leaks` to disable this check

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.stack.stderr
+++ b/src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.stack.stderr
@ -21,5 +21,5 @@ LL |     let t2 = std::thread::spawn(move || thread_2(p));

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.tree.stderr
+++ b/src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.tree.stderr
@ -22,5 +22,5 @@ LL | pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
   = note: inside `std::rt::lang_start_internal` at RUSTLIB/std/src/rt.rs:LL:CC
   = note: inside `std::rt::lang_start::<()>` at RUSTLIB/std/src/rt.rs:LL:CC

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/src/tools/miri/tests/fail/tree_borrows/write_to_shr.stderr
+++ b/src/tools/miri/tests/fail/tree_borrows/write_to_shr.stderr
@ -22,5 +22,5 @@ LL |     let xref = unsafe { &*(x as *mut u64) };

 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout
@ -12,7 +12,7 @@ error[E0425]: cannot find value `no` in this scope
 LL | no
   | ^^ 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`.
 Couldn't compile the test.
--- a/tests/rustdoc-ui/issues/issue-79494.stderr
+++ b/tests/rustdoc-ui/issues/issue-79494.stderr
@ -7,6 +7,6 @@ LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
   = note: source type: `usize` (64 bits)
   = note: target type: `&[u8]` (128 bits)

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0512`.
--- a/tests/ui/associated-type-bounds/return-type-notation/basic.current_without.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.current_without.stderr
@ -25,5 +25,5 @@ note: required by a bound in `is_send`
 LL | fn is_send(_: impl Send) {}
   |                    ^^^^ required by this bound in `is_send`

-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted

--- a/tests/ui/associated-type-bounds/return-type-notation/basic.next_without.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.next_without.stderr
@ -25,5 +25,5 @@ note: required by a bound in `is_send`
 LL | fn is_send(_: impl Send) {}
   |                    ^^^^ required by this bound in `is_send`

-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted

--- a/tests/ui/associated-type-bounds/return-type-notation/equality.current.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.current.stderr
@ -13,5 +13,5 @@ error: return type notation is not allowed to use type equality
 LL | fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted

--- a/tests/ui/associated-type-bounds/return-type-notation/equality.next.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.next.stderr
@ -13,5 +13,5 @@ error: return type notation is not allowed to use type equality
 LL | fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted

--- a/tests/ui/atomic-from-mut-not-available.stderr
+++ b/tests/ui/atomic-from-mut-not-available.stderr
@ -8,6 +8,6 @@ note: if you're trying to build a new `AtomicU64`, consider using `AtomicU64::ne
  --> $SRC_DIR/core/src/sync/atomic.rs:LL:COL
   = note: this error originates in the macro `atomic_int` (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 E0599`.
--- a/tests/ui/consts/const-err4.32bit.stderr
+++ b/tests/ui/consts/const-err4.32bit.stderr
@ -4,6 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL |     Boo = [unsafe { Foo { b: () }.a }; 4][3],
   |                     ^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr
+++ b/tests/ui/consts/const-eval/heap/alloc_intrinsic_uninit.32bit.stderr
@ -9,6 +9,6 @@ LL | const BAR: &i32 = unsafe { &*(intrinsics::const_allocate(4, 4) as *mut i32)
               ╾ALLOC0╼                                     │ ╾──╼
           }

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/consts/const-eval/transmute-const.32bit.stderr
+++ b/tests/ui/consts/const-eval/transmute-const.32bit.stderr
@ -9,6 +9,6 @@ LL | static FOO: bool = unsafe { mem::transmute(3u8) };
               03                                              │ .
           }

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
@ -4,6 +4,6 @@ error[E0284]: type annotations needed: cannot satisfy `<usize as SliceIndex<[u8]
 LL |     let out_of_bounds_ptr = &ptr[255];
   |                              ^^^^^^^^ cannot satisfy `<usize as SliceIndex<[u8]>>::Output == _`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0284`.
--- a/tests/ui/consts/const-eval/ub-upvars.32bit.stderr
+++ b/tests/ui/consts/const-eval/ub-upvars.32bit.stderr
@ -9,6 +9,6 @@ LL | const BAD_UPVAR: &dyn FnOnce() = &{
               ╾ALLOC0╼ ╾ALLOC1╼                         │ ╾──╼╾──╼
           }

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
+++ b/tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
@ -4,6 +4,6 @@ error[E0282]: type annotations needed
 LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
   |                                                                   ^^^^^^^^^^^^^^ cannot infer type for type parameter `U` declared on the function `transmute`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0282`.
--- a/tests/ui/consts/const-points-to-static.32bit.stderr
+++ b/tests/ui/consts/const-points-to-static.32bit.stderr
@ -17,6 +17,6 @@ help: skipping check that does not even have a feature gate
 LL | const TEST: &u8 = &MY_STATIC;
   |                    ^^^^^^^^^

-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 E0080`.
--- a/tests/ui/consts/invalid-union.32bit.stderr
+++ b/tests/ui/consts/invalid-union.32bit.stderr
@ -23,6 +23,6 @@ LL |     let _: &'static _ = &C;
   |
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/consts/issue-63952.32bit.stderr
+++ b/tests/ui/consts/issue-63952.32bit.stderr
@ -9,6 +9,6 @@ LL | const SLICE_WAY_TOO_LONG: &[u8] = unsafe {
               ╾ALLOC0╼ ff ff ff ff                         │ ╾──╼....
           }

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0080`.
--- a/tests/ui/coroutine/coroutine-region-requirements.migrate.stderr
+++ b/tests/ui/coroutine/coroutine-region-requirements.migrate.stderr
@ -7,6 +7,6 @@ LL | fn dangle(x: &mut i32) -> &'static mut i32 {
 LL |             GeneratorState::Complete(c) => return c,
   |                                                   ^ lifetime `'static` required

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0621`.
--- a/tests/ui/generic-associated-types/issue-91139.migrate.stderr
+++ b/tests/ui/generic-associated-types/issue-91139.migrate.stderr
@ -4,5 +4,5 @@ error: expected identifier, found `<<`
 LL | <<<<<<< HEAD
   | ^^ expected identifier

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/higher-ranked/trait-bounds/hrtb-perfect-forwarding.polonius.stderr
+++ b/tests/ui/higher-ranked/trait-bounds/hrtb-perfect-forwarding.polonius.stderr
@ -67,5 +67,5 @@ LL | | }
   |
   = help: a `loop` may express intention better if this is on purpose

-error: aborting due to previous error; 4 warnings emitted
+error: aborting due to 1 previous error; 4 warnings emitted

--- a/tests/ui/impl-trait/coherence-treats-tait-ambig.current.stderr
+++ b/tests/ui/impl-trait/coherence-treats-tait-ambig.current.stderr
@ -8,6 +8,6 @@ LL | impl Into<T> for Foo {
           - impl<T, U> Into<U> for T
             where U: From<T>;

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0119`.
--- a/tests/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr
+++ b/tests/ui/impl-trait/multiple-lifetimes/error-handling.polonius.stderr
@ -11,5 +11,5 @@ LL |         let _: &'b i32 = *u.0;
   |
   = help: consider adding the following bound: `'a: 'b`

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/infinite/infinite-instantiation.polonius.stderr
+++ b/tests/ui/infinite/infinite-instantiation.polonius.stderr
@ -11,5 +11,5 @@ LL | fn function<T:ToOpt + Clone>(counter: usize, t: T) {
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   = note: the full type name has been written to '$TEST_BUILD_DIR/infinite/infinite-instantiation.polonius/infinite-instantiation.long-type.txt'

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- 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

--- 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

--- 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

--- 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

--- 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`.
--- 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

--- 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

--- a/tests/ui/limits/huge-array-simple-32.stderr
+++ b/tests/ui/limits/huge-array-simple-32.stderr
@ -4,5 +4,5 @@ error: values of the type `[u8; 2147516416]` are too big for the current archite
 LL |     let _fat: [u8; (1<<31)+(1<<15)] =
   |         ^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/limits/issue-15919-32.stderr
+++ b/tests/ui/limits/issue-15919-32.stderr
@ -4,5 +4,5 @@ error: values of the type `[usize; usize::MAX]` are too big for the current arch
 LL |     let x = [0usize; 0xffff_ffff];
   |         ^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
@ -16,6 +16,6 @@ LL | |     };
   = note: expected fn pointer `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
              found fn pointer `for<'a> fn(&'a u8, &'a u8) -> &'a u8`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0308`.
--- a/tests/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
@ -7,6 +7,6 @@ LL |         _ => y,
   = note: expected fn pointer `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
              found fn pointer `for<'a> fn(&'a u8, &'a u8) -> &'a u8`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0308`.
--- a/tests/ui/nll/get_default.polonius.stderr
+++ b/tests/ui/nll/get_default.polonius.stderr
@ -13,6 +13,6 @@ LL |
 LL |                 return v;
   |                        - returning this value requires that `*map` is borrowed for `'1`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0502`.
--- a/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr
+++ b/tests/ui/recursion/issue-38591-non-regular-dropck-recursion.polonius.stderr
@ -11,5 +11,5 @@ LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   = note: the full type name has been written to '$TEST_BUILD_DIR/recursion/issue-38591-non-regular-dropck-recursion.polonius/issue-38591-non-regular-dropck-recursion.long-type.txt'

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/recursion/recursion.polonius.stderr
+++ b/tests/ui/recursion/recursion.polonius.stderr
@ -11,5 +11,5 @@ LL | fn test<T:Dot> (n:isize, i:isize, first:T, second:T) ->isize {
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   = note: the full type name has been written to '$TEST_BUILD_DIR/recursion/recursion.polonius/recursion.long-type.txt'

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr
@ -10,6 +10,6 @@ note: required by a bound in `Main::main::{opaque#0}`
 LL |         fn main() -> impl std::process::Termination;
   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::main::{opaque#0}`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0277`.
--- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr
+++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr
@ -10,6 +10,6 @@ note: required by a bound in `Main::{opaque#0}`
 LL |         fn main() -> impl std::process::Termination;
   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::{opaque#0}`

-error: aborting due to previous error
+error: aborting due to 1 previous error

 For more information about this error, try `rustc --explain E0277`.
--- a/tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.stderr
@ -2,5 +2,5 @@ error: Dlltool could not create import library with $DLLTOOL -d $DEF_FILE -D foo
       
       $DLLTOOL: Syntax error in def file $DEF_FILE:1

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
@ -4,5 +4,5 @@ error: import name type must be of the form `import_name_type = "string"`
 LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = 6)]
   |                                          ^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.stderr
@ -4,5 +4,5 @@ error: multiple `import_name_type` arguments in a single `#[link]` attribute
 LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated", import_name_type = "decorated")]
   |                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
@ -4,5 +4,5 @@ error: unknown import name type `unknown`, expected one of: decorated, noprefix,
 LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")]
   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
@ -4,5 +4,5 @@ error: import name type is only supported on x86
 LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated")]
   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.stderr
@ -1,4 +1,4 @@
 error: Error calling dlltool 'does_not_exit.exe': program not found

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.stderr
@ -4,5 +4,5 @@ error: multiple declarations of external function `f` from library `foo.dll` hav
 LL |         fn f(x: i32);
   |         ^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.stderr
+++ b/tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.stderr
@ -4,5 +4,5 @@ error: ABI not supported by `#[link(kind = "raw-dylib")]` on this architecture
 LL |     fn f(x: i32);
   |     ^^^^^^^^^^^^

-error: aborting due to previous error
+error: aborting due to 1 previous error

--- a/tests/ui/type_length_limit.polonius.stderr
+++ b/tests/ui/type_length_limit.polonius.stderr
@ -7,5 +7,5 @@ LL | pub fn drop<T>(_x: T) {}
   = note: the full type name has been written to '$TEST_BUILD_DIR/type_length_limit.polonius/type_length_limit.long-type.txt'
   = help: consider adding a `#![type_length_limit="8"]` attribute to your crate

-error: aborting due to previous error
+error: aborting due to 1 previous error