Show number in error message even for one error

Co-authored-by: Adrian <adrian.iosdev@gmail.com>

Author: Noratrieb

compiler/rustc_errors/src/lib.rs

@@ -1465,7 +1465,7 @@ impl HandlerInner {
         };
         let errors = match self.deduplicated_err_count {
             0 => Cow::from(""),
-            1 => Cow::from("aborting due to previous error"),
+            1 => Cow::from("aborting due to 1 previous error"),
             count => Cow::from(format!("aborting due to {count} previous errors")),
         };
         if self.treat_err_as_bug() {

compiler/rustc_hir_typeck/src/expr.rs

@@ -1932,7 +1932,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     /// 8 |     foo::Foo {};
     ///   |     ^^^^^^^^ missing `you_can_use_this_field`
     ///
-    /// error: aborting due to previous error
+    /// error: aborting due to 1 previous error
     /// ```
     fn report_missing_fields(
         &self,
@@ -2049,7 +2049,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     /// 8 |     foo::Foo {};
     ///   |     ^^^^^^^^
     ///
-    /// error: aborting due to previous error
+    /// error: aborting due to 1 previous error
     /// ```
     fn report_private_fields(
         &self,

library/core/src/intrinsics/mir.rs

@@ -193,7 +193,7 @@
 //! 27 | |     )
 //!    | |_____- binding declared here but left uninitialized
 //!
-//! error: aborting due to previous error
+//! error: aborting due to 1 previous error
 //!
 //! For more information about this error, try `rustc --explain E0381`.
 //! ```

tests/ui/abi/abi-typo-unstable.stderr

@@ -6,6 +6,6 @@ LL | extern "rust-intrinsec" fn rust_intrinsic() {}
    |
    = note: invoke `rustc --print=calling-conventions` for a full list of supported calling conventions.
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0703`.

tests/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr

@@ -16,6 +16,6 @@ LL | fn oom() -> ! {
    |    ^^^
    = note: this error originates in the attribute macro `alloc_error_handler` (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 E0061`.

tests/ui/allocator/allocator-args.stderr

@@ -4,5 +4,5 @@ error: malformed `global_allocator` attribute input
 LL | #[global_allocator(malloc)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[global_allocator]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/allocator/function-allocator.stderr

@@ -4,5 +4,5 @@ error: allocators must be statics
 LL | fn foo() {}
    | ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/allocator/two-allocators.stderr

@@ -10,5 +10,5 @@ LL | static B: System = System;
    |
    = note: this error originates in the attribute macro `global_allocator` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/allocator/two-allocators2.stderr

@@ -1,4 +1,4 @@
 error: the `#[global_allocator]` in this crate conflicts with global allocator in: system_allocator
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/allocator/two-allocators3.stderr

@@ -1,4 +1,4 @@
 error: the `#[global_allocator]` in system_allocator conflicts with global allocator in: system_allocator2
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/argument-suggestions/complex.stderr

@@ -14,6 +14,6 @@ help: did you mean
 LL |   complex(/* u32 */, &"", /* E */, F::X2, G{}, X {}, Y {}, Z {});
    |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/argument-suggestions/display-is-suggestable.stderr

@@ -14,6 +14,6 @@ help: provide the argument
 LL |     foo(/* &dyn std::fmt::Display + Send */);
    |        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-112507.stderr

@@ -22,6 +22,6 @@ LL ~         ,
 LL ~         None);
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-96638.stderr

@@ -16,6 +16,6 @@ help: provide the argument
 LL |     f(/* usize */, &x, /* usize */);
    |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-97197.stderr

@@ -14,6 +14,6 @@ help: provide the arguments
 LL |     g((), /* bool */, /* bool */, /* bool */, /* bool */, ());
    |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-97484.stderr

@@ -23,6 +23,6 @@ LL -     foo(&&A, B, C, D, E, F, G);
 LL +     foo(&&A, D, /* &E */, G);
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-98894.stderr

@@ -14,6 +14,6 @@ help: provide the argument
 LL |     (|_, ()| ())(if true {} else {return;}, ());
    |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0057`.

tests/ui/argument-suggestions/issue-98897.stderr

@@ -14,6 +14,6 @@ help: provide the argument
 LL |     (|_, ()| ())([return, ()], ());
    |                 ~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0057`.

tests/ui/argument-suggestions/issue-99482.stderr

@@ -14,6 +14,6 @@ help: provide the argument
 LL |     let _f = f((), main);
    |               ~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0057`.

tests/ui/argument-suggestions/too-long.stderr

@@ -19,6 +19,6 @@ help: consider dereferencing the borrow
 LL |     qux.foo(a, b, c, d, e, *f, g, h, i, j, k, l);
    |                            +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/argument-suggestions/two-mismatch-notes.stderr

@@ -24,6 +24,6 @@ note: function defined here
 LL | fn foo(_: fn(i32), _: Wrapper<i32>) {}
    |    ^^^ ----------  ---------------
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/array-slice-vec/array_const_index-0.stderr

@@ -4,6 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL | const B: i32 = (&A)[1];
    |                ^^^^^^^ index out of bounds: the length is 0 but the index is 1
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0080`.

tests/ui/array-slice-vec/array_const_index-1.stderr

@@ -4,6 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL | const B: i32 = A[1];
    |                ^^^^ index out of bounds: the length is 0 but the index is 1
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0080`.

tests/ui/array-slice-vec/match_arr_unknown_len.stderr

@@ -7,6 +7,6 @@ LL |         [1, 2] => true,
    = note: expected array `[u32; 2]`
               found array `[u32; N]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/array-slice-vec/slice-mut-2.stderr

@@ -9,6 +9,6 @@ help: consider changing this to be a mutable reference
 LL |     let x: &[isize] = &mut [1, 2, 3, 4, 5];
    |                        +++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0596`.

tests/ui/array-slice-vec/slice-mut.stderr

@@ -9,6 +9,6 @@ LL |     let y: &mut[_] = &x[2..4];
    = note: expected mutable reference `&mut [_]`
                       found reference `&[isize]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/array-slice-vec/slice-to-vec-comparison.stderr

@@ -7,6 +7,6 @@ LL |     a > b;
    = note: expected reference `&[_; 0]`
               found reference `&Vec<u8>`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.

tests/ui/array-slice-vec/vec-macro-with-comma-only.stderr

@@ -6,5 +6,5 @@ LL |     vec![,];
    |
    = note: while trying to match end of macro
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/array-slice-vec/vec-mut-iter-borrow.stderr

@@ -9,6 +9,6 @@ LL |     for x in &mut xs {
 LL |         xs.push(1)
    |         ^^ second 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`.

tests/ui/array-slice-vec/vec-res-add.stderr

@@ -6,6 +6,6 @@ LL |     let k = i + j;
    |             |
    |             Vec<R>
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0369`.

tests/ui/array-slice-vec/vector-no-ann.stderr

@@ -9,6 +9,6 @@ help: consider giving `_foo` an explicit type, where the type for type parameter
 LL |     let _foo: Vec<T> = Vec::new();
    |             ++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0282`.

tests/ui/asm/issue-113788.stderr

@@ -4,6 +4,6 @@ error[E0412]: cannot find type `PEB` in this scope
 LL |     let peb: *const PEB;
    |                     ^^^ 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`.

tests/ui/asm/issue-72570.stderr

@@ -4,5 +4,5 @@ error: invalid register `invalid`: unknown register
 LL |         asm!("", in("invalid") "".len());
    |                  ^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/asm/issue-85247.rwpi.stderr

@@ -4,5 +4,5 @@ error: cannot use register `r9`: the RWPI static base register (r9) cannot be us
 LL |         asm!("", out("r9") _);
    |                  ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/asm/issue-87802.stderr

@@ -6,5 +6,5 @@ LL |         asm!("/* {0} */", out(reg) x);
    |
    = note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/asm/issue-99071.stderr

@@ -4,5 +4,5 @@ error: cannot use register `r8`: high registers (r8+) can only be used as clobbe
 LL |         asm!("", in("r8") 0);
    |                  ^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/asm/issue-99122.stderr

@@ -6,6 +6,6 @@ LL |     let pointer = 1u32 as *const _;
    |
    = note: the type information given here is insufficient to check whether the pointer cast is valid
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0641`.

tests/ui/asm/reg-conflict.stderr

@@ -6,5 +6,5 @@ LL |         asm!("", out("d0") _, out("s1") _);
    |                  |
    |                  register `d0`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/assign-imm-local-twice.stderr

@@ -10,6 +10,6 @@ LL |     println!("v={}", v);
 LL |     v = 2;
    |     ^^^^^ cannot assign twice to immutable variable
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0384`.

tests/ui/associated-consts/associated-const-ambiguity-report.stderr

@@ -21,6 +21,6 @@ LL | const X: i32 = <i32 as Bar>::ID;
 LL | const X: i32 = <i32 as Foo>::ID;
    |                ~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0034`.

tests/ui/associated-consts/associated-const-array-len.stderr

@@ -10,6 +10,6 @@ help: this trait has no implementations, consider adding one
 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 E0277`.

tests/ui/associated-consts/associated-const-dead-code.stderr

@@ -12,5 +12,5 @@ note: the lint level is defined here
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/associated-consts/associated-const-generic-obligations.stderr

@@ -12,6 +12,6 @@ LL |     const FROM: Self::Out;
    = note: expected associated type `<T as Foo>::Out`
                     found reference `&'static str`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0326`.

tests/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr

@@ -13,6 +13,6 @@ LL | impl<'a> Foo for &'a () {
    |      ^^
    = 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`.

tests/ui/associated-consts/associated-const-impl-wrong-type.stderr

@@ -10,6 +10,6 @@ note: type in trait
 LL |     const BAR: u32;
    |                ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0326`.

tests/ui/associated-consts/associated-const-in-trait.stderr

@@ -13,6 +13,6 @@ LL |     const N: usize;
    |           ^ ...because it contains this associated `const`
    = help: consider moving `N` 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`.

tests/ui/associated-consts/associated-const-no-item.stderr

@@ -11,6 +11,6 @@ note: `Foo` defines an item `ID`, perhaps you need to implement it
 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 E0599`.

tests/ui/associated-consts/associated-const-private-impl.stderr

@@ -7,6 +7,6 @@ LL |             const ID: i32 = 1;
 LL |     assert_eq!(1, bar1::Foo::ID);
    |                              ^^ private associated constant
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0624`.

tests/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr

@@ -6,5 +6,5 @@ LL |     let _array = [4; <A as Foo>::Y];
    |
    = note: this may fail depending on what value the parameter takes
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/ui/associated-consts/associated-const-type-parameter-arrays.stderr

@@ -7,5 +7,5 @@ LL |     let _array: [u32; <A as Foo>::Y];
    = note: type parameters may not be used in const expressions
    = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
 
-error: aborting due to previous error
+error: aborting due to 1 previous error