Fixes error count display is different when there's only one error left

compiler/rustc_errors/src/lib.rs

@@ -1440,7 +1440,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

@@ -1858,7 +1858,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,
@@ -1980,7 +1980,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`.
 //! ```

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
 

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
 

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
 

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
 

src/tools/clippy/tests/ui-toml/bad_toml/conf_bad_toml.stderr

@@ -4,5 +4,5 @@ error: error reading Clippy's configuration file: expected `.`, `=`
 LL | fn this_is_obviously(not: a, toml: file) {
    |    ^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/bad_toml_type/conf_bad_type.stderr

@@ -4,5 +4,5 @@ error: error reading Clippy's configuration file: invalid type: integer `42`, ex
 LL | disallowed-names = 42
    |                    ^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/conf_deprecated_key/conf_deprecated_key.stderr

@@ -19,5 +19,5 @@ LL | fn cognitive_complexity() {
    = help: you could split it up into multiple smaller functions
    = note: `-D clippy::cognitive-complexity` implied by `-D warnings`
 
-error: aborting due to previous error; 2 warnings emitted
+error: aborting due to 1 previous error; 2 warnings emitted
 

src/tools/clippy/tests/ui-toml/disallowed_names_replace/disallowed_names.stderr

@@ -6,5 +6,5 @@ LL |     let ducks = ["quack", "quack"];
    |
    = note: `-D clippy::disallowed-names` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/doc_valid_idents_append/doc_markdown.stderr

@@ -10,5 +10,5 @@ help: try
 LL | /// `TestItemThingyOfCoolness` might sound cool but is not on the list and should be linted.
    |     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/duplicated_keys/duplicated_keys.stderr

@@ -4,5 +4,5 @@ error: error reading Clippy's configuration file: duplicate key `cognitive-compl
 LL | cognitive-complexity-threshold = 4
    | ^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/duplicated_keys_deprecated/duplicated_keys.stderr

@@ -10,5 +10,5 @@ warning: error reading Clippy's configuration file: deprecated field `cyclomatic
 LL | cyclomatic-complexity-threshold = 3
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 

src/tools/clippy/tests/ui-toml/duplicated_keys_deprecated_2/duplicated_keys.stderr

@@ -10,5 +10,5 @@ warning: error reading Clippy's configuration file: deprecated field `cyclomatic
 LL | cyclomatic-complexity-threshold = 3
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 

src/tools/clippy/tests/ui-toml/fn_params_excessive_bools/test.stderr

@@ -7,5 +7,5 @@ LL | fn g(_: bool, _: bool) {}
    = help: consider refactoring bools into two-variant enums
    = note: `-D clippy::fn-params-excessive-bools` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/ifs_same_cond/ifs_same_cond.stderr

@@ -11,5 +11,5 @@ LL |     if x.get() {
    |        ^^^^^^^
    = note: `-D clippy::ifs-same-cond` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/invalid_min_rust_version/invalid_min_rust_version.stderr

@@ -1,4 +1,4 @@
 error: error reading Clippy's configuration file. `invalid.version` is not a valid Rust version
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/large_futures/large_futures.stderr

@@ -6,5 +6,5 @@ LL |     should_warn().await;
    |
    = note: `-D clippy::large-futures` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/max_suggested_slice_pattern_length/index_refutable_slice.stderr

@@ -18,5 +18,5 @@ help: and replace the index expressions here
 LL |         println!("{}", slice_7);
    |                        ~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.stderr

@@ -6,5 +6,5 @@ LL |     let _: Option<u64> = Some(&16).map(|b| *b);
    |
    = note: `-D clippy::map-clone` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/semicolon_block/semicolon_inside_block.stderr

@@ -14,5 +14,5 @@ LL ~         unit_fn_block();
 LL ~     }
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui-toml/struct_excessive_bools/test.stderr

@@ -9,5 +9,5 @@ LL | | }
    = help: consider using a state machine or refactoring bools into two-variant enums
    = note: `-D clippy::struct-excessive-bools` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/borrow_deref_ref_unfixable.stderr

@@ -14,5 +14,5 @@ help: if you would like to deref, try using `&**`
 LL |         let x: &str = &**s;
    |                       ~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/char_lit_as_u8.stderr

@@ -7,5 +7,5 @@ LL |     let _ = '❤' as u8; // no suggestion, since a byte literal won't work.
    = note: `char` is four bytes wide, but `u8` is a single byte
    = note: `-D clippy::char-lit-as-u8` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/cognitive_complexity_attr_used.stderr

@@ -7,5 +7,5 @@ LL | fn kaboom() {
    = help: you could split it up into multiple smaller functions
    = note: `-D clippy::cognitive-complexity` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/copy_iterator.stderr

@@ -13,5 +13,5 @@ LL | | }
    = note: consider implementing `IntoIterator` instead
    = note: `-D clippy::copy-iterator` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-10148.stderr

@@ -8,5 +8,5 @@ LL |     println!(with_span!(""something ""));
    |
    = note: `-D clippy::println-empty-string` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-2774.stderr

@@ -11,5 +11,5 @@ LL - pub fn add_barfoos_to_foos<'a>(bars: &HashSet<&'a Bar>) {
 LL + pub fn add_barfoos_to_foos(bars: &HashSet<&Bar>) {
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-3717.stderr

@@ -18,5 +18,5 @@ help: ...and use generic constructor
 LL |     let _: HashSet<usize> = HashSet::default();
    |                             ~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-3891.stderr

@@ -6,5 +6,5 @@ LL |     1x;
    |
    = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-5497.stderr

@@ -6,5 +6,5 @@ LL |     const OOB: i32 = [1][1] + T::OOB;
    |
    = note: `#[deny(unconditional_panic)]` on by default
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-5835.stderr

@@ -6,5 +6,5 @@ LL |     /// 位
    |
    = note: `-D clippy::tabs-in-doc-comments` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-5872.stderr

@@ -6,5 +6,5 @@ LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<_>>().is_empty();
    |
    = note: `-D clippy::needless-collect` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-6254.stderr

@@ -10,5 +10,5 @@ LL |         FOO_REF_REF => {},
    = note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
    = note: `-D indirect-structural-match` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-6255.stderr

@@ -9,5 +9,5 @@ LL | define_other_core!();
    |
    = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-6256.stderr

@@ -9,6 +9,6 @@ LL |     let f = |x: &dyn TT| x.func();
    |              |  let's call the lifetime of this reference `'1`
    |              `x` is a reference that is only valid in the closure body
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0521`.

src/tools/clippy/tests/ui/crashes/ice-7169.stderr

@@ -6,5 +6,5 @@ LL |     if let Ok(_) = Ok::<_, ()>(A::<String>::default()) {}
    |
    = note: `-D clippy::redundant-pattern-matching` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-7868.stderr

@@ -7,5 +7,5 @@ LL |     unsafe { 0 };
    = help: consider adding a safety comment on the preceding line
    = note: `-D clippy::undocumented-unsafe-blocks` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-7869.stderr

@@ -11,5 +11,5 @@ LL | | }
    = help: remove the prefixes and use full paths to the variants instead of glob imports
    = note: `-D clippy::enum-variant-names` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-8250.stderr

@@ -6,5 +6,5 @@ LL |     let _ = s[1..].splitn(2, '.').next()?;
    |
    = note: `-D clippy::needless-splitn` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-8821.stderr

@@ -6,5 +6,5 @@ LL |     let _: () = FN();
    |
    = note: `-D clippy::let-unit-value` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-9041.stderr

@@ -6,5 +6,5 @@ LL |     things.iter().find(|p| is_thing_ready(p)).is_some()
    |
    = note: `-D clippy::search-is-some` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-9445.stderr

@@ -8,5 +8,5 @@ LL | const UNINIT: core::mem::MaybeUninit<core::cell::Cell<&'static ()>> = core:
    |
    = note: `-D clippy::declare-interior-mutable-const` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/ice-96721.stderr

@@ -4,5 +4,5 @@ error: malformed `path` attribute input
 LL | #[path = foo!()]
    | ^^^^^^^^^^^^^^^^ help: must be of the form: `#[path = "file"]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/needless_lifetimes_impl_trait.stderr

@@ -15,5 +15,5 @@ LL -     fn baz<'a>(&'a self) -> impl Foo + 'a {
 LL +     fn baz(&self) -> impl Foo + '_ {
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crashes/needless_pass_by_value-w-late-bound.stderr

@@ -11,5 +11,5 @@ LL | struct Foo<'a>(&'a [(); 100]);
    | ^^^^^^^^^^^^^^
    = note: `-D clippy::needless-pass-by-value` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crate_in_macro_def.stderr

@@ -6,5 +6,5 @@ LL |             println!("{}", crate::unhygienic::MESSAGE);
    |
    = note: `-D clippy::crate-in-macro-def` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crate_level_checks/no_std_swap.stderr

@@ -8,5 +8,5 @@ LL | |     b = a;
    = note: or maybe you should use `core::mem::replace`?
    = note: `-D clippy::almost-swapped` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/crate_level_checks/std_main_recursion.stderr

@@ -7,5 +7,5 @@ LL |     main();
    = help: consider using another function for this recursion
    = note: `-D clippy::main-recursion` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/def_id_nocore.stderr

@@ -7,5 +7,5 @@ LL |     pub fn as_ref(self) -> &'static str {
    = help: consider choosing a less ambiguous name
    = note: `-D clippy::wrong-self-convention` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/doc_link_with_quotes.stderr

@@ -6,5 +6,5 @@ LL | /// Calls ['bar'] uselessly
    |
    = note: `-D clippy::doc-link-with-quotes` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/double_neg.stderr

@@ -6,5 +6,5 @@ LL |     --x;
    |
    = note: `-D clippy::double-neg` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/duplicate_underscore_argument.stderr

@@ -6,5 +6,5 @@ LL | fn join_the_dark_side(darth: i32, _darth: i32) {}
    |
    = note: `-D clippy::duplicate-underscore-argument` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/clippy/tests/ui/empty_enum.stderr

@@ -7,5 +7,5 @@ LL | enum Empty {}
    = help: consider using the uninhabited type `!` (never type) or a wrapper around it to introduce a type which can't be instantiated
    = note: `-D clippy::empty-enum` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error