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/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
index 83f311efd..def4a413a 100644
--- a/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
+++ b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
@@ -10,5 +10,5 @@ note: required by a bound in `S`
 LL | struct S<const L: usize>;
    |          ^^^^^^^^^^^^^^ required by this bound in `S`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr b/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr
index b032ccbe5..85b492c05 100644
--- a/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr
+++ b/tests/ui/specialization/min_specialization/impl-on-nonexisting.stderr
@@ -4,6 +4,6 @@ error[E0412]: cannot find type `NonExistent` in this scope
 LL | impl Trait for NonExistent {}
    |                ^^^^^^^^^^^ 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`.
diff --git a/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr b/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr
index 934103d49..553bee2d2 100644
--- a/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr
+++ b/tests/ui/specialization/min_specialization/impl_specialization_trait.stderr
@@ -6,5 +6,5 @@ LL | impl specialization_trait::SpecTrait for A {
    |
    = help: add `#![feature(min_specialization)]` to the crate attributes to enable
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/repeated_projection_type.stderr b/tests/ui/specialization/min_specialization/repeated_projection_type.stderr
index a751ba793..01fd04dd3 100644
--- a/tests/ui/specialization/min_specialization/repeated_projection_type.stderr
+++ b/tests/ui/specialization/min_specialization/repeated_projection_type.stderr
@@ -4,5 +4,5 @@ error: cannot specialize on associated type `<V as Id>::This == (I,)`
 LL | impl<I, V: Id<This = (I,)>> X for V {
    |               ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr b/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr
index 16dccb10b..d80ee7b57 100644
--- a/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr
+++ b/tests/ui/specialization/min_specialization/repeating_lifetimes.stderr
@@ -4,5 +4,5 @@ error: specializing impl repeats parameter `'a`
 LL | impl<'a> X for (&'a u8, &'a u8) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/repeating_param.stderr b/tests/ui/specialization/min_specialization/repeating_param.stderr
index 5e6adf723..90ec4b945 100644
--- a/tests/ui/specialization/min_specialization/repeating_param.stderr
+++ b/tests/ui/specialization/min_specialization/repeating_param.stderr
@@ -4,5 +4,5 @@ error: specializing impl repeats parameter `T`
 LL | impl<T> X for (T, T) {
    | ^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr b/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr
index ba9d6bbe3..42c0de85e 100644
--- a/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr
+++ b/tests/ui/specialization/min_specialization/spec-marker-supertraits.stderr
@@ -4,5 +4,5 @@ error: cannot specialize on trait `HasMethod`
 LL | impl<T: Marker> Spec for T {
    |         ^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/specialization_super_trait.stderr b/tests/ui/specialization/min_specialization/specialization_super_trait.stderr
index e93578662..1fc064a0a 100644
--- a/tests/ui/specialization/min_specialization/specialization_super_trait.stderr
+++ b/tests/ui/specialization/min_specialization/specialization_super_trait.stderr
@@ -4,5 +4,5 @@ error: cannot specialize on trait `Default`
 LL | impl<T: Default> SpecMarker for T {
    |         ^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/specialize_nothing.stderr b/tests/ui/specialization/min_specialization/specialize_nothing.stderr
index 65f73781c..8e7dc9c5e 100644
--- a/tests/ui/specialization/min_specialization/specialize_nothing.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_nothing.stderr
@@ -10,5 +10,5 @@ note: impl is a specialization of this impl
 LL | impl<T> Special for T {
    | ^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/specialize_on_static.stderr b/tests/ui/specialization/min_specialization/specialize_on_static.stderr
index 9a16798f1..8c2bf6c2d 100644
--- a/tests/ui/specialization/min_specialization/specialize_on_static.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_on_static.stderr
@@ -4,5 +4,5 @@ error: cannot specialize on `'static` lifetime
 LL | impl X for &'static u8 {
    | ^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/specialize_on_trait.stderr b/tests/ui/specialization/min_specialization/specialize_on_trait.stderr
index 7b79c7eb4..c86b4ac39 100644
--- a/tests/ui/specialization/min_specialization/specialize_on_trait.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_on_trait.stderr
@@ -4,5 +4,5 @@ error: cannot specialize on trait `SpecMarker`
 LL | impl<T: SpecMarker> X for T {
    |         ^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/specialization/min_specialization/specialize_on_type_error.stderr b/tests/ui/specialization/min_specialization/specialize_on_type_error.stderr
index cc12302bd..1686f6f0c 100644
--- a/tests/ui/specialization/min_specialization/specialize_on_type_error.stderr
+++ b/tests/ui/specialization/min_specialization/specialize_on_type_error.stderr
@@ -7,6 +7,6 @@ LL |     type Assoc: Y;
 LL | impl<T: X> Z for A<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^ missing `Assoc` 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`.