Merging upstream version 1.76.0+dfsg1.

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

12 files changed, 12 insertions, 12 deletions

diff --git a/tests/ui/use/issue-18986.stderr b/tests/ui/use/issue-18986.stderr
index 6c23178c7..350cb18f9 100644
--- a/tests/ui/use/issue-18986.stderr
+++ b/tests/ui/use/issue-18986.stderr
@@ -4,6 +4,6 @@ error[E0574]: expected struct, variant or union type, found trait `Trait`
 LL |         Trait { x: 42 } => ()
    |         ^^^^^ 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/use/use-after-move-based-on-type.stderr b/tests/ui/use/use-after-move-based-on-type.stderr
index 7b4d24549..02a6ed599 100644
--- a/tests/ui/use/use-after-move-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-based-on-type.stderr
@@ -14,6 +14,6 @@ help: consider cloning the value if the performance cost is acceptable
 LL |     let _y = x.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/use/use-after-move-implicity-coerced-object.stderr b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
index 84487a8d0..35ede2171 100644
--- a/tests/ui/use/use-after-move-implicity-coerced-object.stderr
+++ b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
@@ -18,6 +18,6 @@ LL |     fn push(&mut self, n: Box<dyn ToString + 'static>) {
    |        |
    |        in this method
 
-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/use/use-after-move-self-based-on-type.stderr b/tests/ui/use/use-after-move-self-based-on-type.stderr
index 1bdf49801..17827becc 100644
--- a/tests/ui/use/use-after-move-self-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-self-based-on-type.stderr
@@ -14,6 +14,6 @@ note: `S::bar` takes ownership of the receiver `self`, which moves `self`
 LL |     pub fn bar(self) {}
    |                ^^^^
 
-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/use/use-after-move-self.stderr b/tests/ui/use/use-after-move-self.stderr
index 59cc22ead..ebd6cef58 100644
--- a/tests/ui/use/use-after-move-self.stderr
+++ b/tests/ui/use/use-after-move-self.stderr
@@ -14,6 +14,6 @@ note: `S::bar` takes ownership of the receiver `self`, which moves `self`
 LL |     pub fn bar(self) {}
    |                ^^^^
 
-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/use/use-associated-const.stderr b/tests/ui/use/use-associated-const.stderr
index 4bc0d7e61..f0de7a746 100644
--- a/tests/ui/use/use-associated-const.stderr
+++ b/tests/ui/use/use-associated-const.stderr
@@ -4,6 +4,6 @@ error[E0432]: unresolved import `foo::Foo`
 LL | use foo::Foo::BAR;
    |          ^^^ `Foo` is a struct, not a module
 
-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/use/use-crate-self.stderr b/tests/ui/use/use-crate-self.stderr
index dd4036bff..a8f65b128 100644
--- a/tests/ui/use/use-crate-self.stderr
+++ b/tests/ui/use/use-crate-self.stderr
@@ -4,5 +4,5 @@ error: crate root imports need to be explicitly named: `use crate as name;`
 LL | use crate::{self};
    |             ^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/use/use-meta-mismatch.stderr b/tests/ui/use/use-meta-mismatch.stderr
index 62b71fe8e..b793229e5 100644
--- a/tests/ui/use/use-meta-mismatch.stderr
+++ b/tests/ui/use/use-meta-mismatch.stderr
@@ -4,6 +4,6 @@ error[E0463]: can't find crate for `fake_crate`
 LL | extern crate fake_crate as extra;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0463`.
diff --git a/tests/ui/use/use-mod/use-mod-5.stderr b/tests/ui/use/use-mod/use-mod-5.stderr
index 62859e261..22201361c 100644
--- a/tests/ui/use/use-mod/use-mod-5.stderr
+++ b/tests/ui/use/use-mod/use-mod-5.stderr
@@ -14,6 +14,6 @@ help: alternatively, use the multi-path `use` syntax to import `self`
 LL | use foo::bar::{self};
    |               +    +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0429`.
diff --git a/tests/ui/use/use-mod/use-mod-6.stderr b/tests/ui/use/use-mod/use-mod-6.stderr
index 2d2c90067..f9ab346f8 100644
--- a/tests/ui/use/use-mod/use-mod-6.stderr
+++ b/tests/ui/use/use-mod/use-mod-6.stderr
@@ -14,6 +14,6 @@ help: alternatively, use the multi-path `use` syntax to import `self`
 LL | use foo::bar::{self as abc};
    |               +           +
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0429`.
diff --git a/tests/ui/use/use-nested-groups-error.stderr b/tests/ui/use/use-nested-groups-error.stderr
index 7234c8ec6..d73754c6b 100644
--- a/tests/ui/use/use-nested-groups-error.stderr
+++ b/tests/ui/use/use-nested-groups-error.stderr
@@ -7,6 +7,6 @@ LL | use a::{b1::{C1, C2}, B2};
    |              no `C1` in `a::b1`
    |              help: a similar name exists in the module: `C2`
 
-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/use/use-paths-as-items.stderr b/tests/ui/use/use-paths-as-items.stderr
index b09001a9b..c54f40daf 100644
--- a/tests/ui/use/use-paths-as-items.stderr
+++ b/tests/ui/use/use-paths-as-items.stderr
@@ -8,6 +8,6 @@ LL | use std::mem;
    |
    = note: `mem` must be defined only once in the type 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 E0252`.