Merging upstream version 1.76.0+dfsg1.

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

13 files changed, 13 insertions, 13 deletions

diff --git a/tests/rustdoc-ui/issues/issue-102986.stderr b/tests/rustdoc-ui/issues/issue-102986.stderr
index 3a573726c..996eb41c4 100644
--- a/tests/rustdoc-ui/issues/issue-102986.stderr
+++ b/tests/rustdoc-ui/issues/issue-102986.stderr
@@ -9,6 +9,6 @@ help: consider replacing `typeof(...)` with an actual type
 LL |     y: (&'static str,),
    |         ~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0516`.
diff --git a/tests/rustdoc-ui/issues/issue-105334.stderr b/tests/rustdoc-ui/issues/issue-105334.stderr
index e163bb4db..d992b219b 100644
--- a/tests/rustdoc-ui/issues/issue-105334.stderr
+++ b/tests/rustdoc-ui/issues/issue-105334.stderr
@@ -4,6 +4,6 @@ error[E0747]: constant provided when a type was expected
 LL | impl Vec< br##"*.."## > {}
    |           ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0747`.
diff --git a/tests/rustdoc-ui/issues/issue-105737.stderr b/tests/rustdoc-ui/issues/issue-105737.stderr
index 2dd9beb17..2c63c345e 100644
--- a/tests/rustdoc-ui/issues/issue-105737.stderr
+++ b/tests/rustdoc-ui/issues/issue-105737.stderr
@@ -7,6 +7,6 @@ LL | impl Vec<lol> {}
    = help: `lol` is a function item, not a type
    = help: function item types cannot be named directly
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0747`.
diff --git a/tests/rustdoc-ui/issues/issue-106213.stderr b/tests/rustdoc-ui/issues/issue-106213.stderr
index 0a4ff69ba..fa79fe2e7 100644
--- a/tests/rustdoc-ui/issues/issue-106213.stderr
+++ b/tests/rustdoc-ui/issues/issue-106213.stderr
@@ -4,6 +4,6 @@ error[E0224]: at least one trait is required for an object type
 LL | fn use_avx() -> dyn  {
    |                 ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0224`.
diff --git a/tests/rustdoc-ui/issues/issue-106226.stderr b/tests/rustdoc-ui/issues/issue-106226.stderr
index 1c973dab6..4d063b461 100644
--- a/tests/rustdoc-ui/issues/issue-106226.stderr
+++ b/tests/rustdoc-ui/issues/issue-106226.stderr
@@ -4,6 +4,6 @@ error[E0121]: the placeholder `_` is not allowed within types on item signatures
 LL | type F = [_; ()];
    |           ^ not allowed in type signatures
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0121`.
diff --git a/tests/rustdoc-ui/issues/issue-61592-2.stderr b/tests/rustdoc-ui/issues/issue-61592-2.stderr
index 1b7f8bb55..de376ad80 100644
--- a/tests/rustdoc-ui/issues/issue-61592-2.stderr
+++ b/tests/rustdoc-ui/issues/issue-61592-2.stderr
@@ -7,6 +7,6 @@ LL | #[doc = "baz"]
 LL | pub use foo::Foo as _;
    | ---------------------- anonymous import
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0780`.
diff --git a/tests/rustdoc-ui/issues/issue-61592.stderr b/tests/rustdoc-ui/issues/issue-61592.stderr
index 9c9c9106f..0b96b6593 100644
--- a/tests/rustdoc-ui/issues/issue-61592.stderr
+++ b/tests/rustdoc-ui/issues/issue-61592.stderr
@@ -6,6 +6,6 @@ LL | #[doc(inline)]
 LL | pub use foo::Foo as _;
    | ---------------------- anonymous import
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0780`.
diff --git a/tests/rustdoc-ui/issues/issue-61732.stderr b/tests/rustdoc-ui/issues/issue-61732.stderr
index d16ec6a85..f351f52d1 100644
--- a/tests/rustdoc-ui/issues/issue-61732.stderr
+++ b/tests/rustdoc-ui/issues/issue-61732.stderr
@@ -6,6 +6,6 @@ LL | pub(in crate::r#mod) fn main() {}
    |
    = help: consider adding `extern crate r#mod` to use the `r#mod` crate
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0433`.
diff --git a/tests/rustdoc-ui/issues/issue-79465.stderr b/tests/rustdoc-ui/issues/issue-79465.stderr
index d187a2e66..e7b433268 100644
--- a/tests/rustdoc-ui/issues/issue-79465.stderr
+++ b/tests/rustdoc-ui/issues/issue-79465.stderr
@@ -4,6 +4,6 @@ error[E0220]: associated type `A` not found for `T`
 LL | pub fn f1<T>(x: T::A) {}
    |                    ^ associated type `A` not found
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0220`.
diff --git a/tests/rustdoc-ui/issues/issue-79467.stderr b/tests/rustdoc-ui/issues/issue-79467.stderr
index 561513a43..cb030a311 100644
--- a/tests/rustdoc-ui/issues/issue-79467.stderr
+++ b/tests/rustdoc-ui/issues/issue-79467.stderr
@@ -4,6 +4,6 @@ error[E0224]: at least one trait is required for an object type
 LL |     dyn 'static: 'static + Copy,
    |     ^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0224`.
diff --git a/tests/rustdoc-ui/issues/issue-79494.stderr b/tests/rustdoc-ui/issues/issue-79494.stderr
index 7ed5ed382..abcd69d3a 100644
--- 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`.
diff --git a/tests/rustdoc-ui/issues/issue-81662-shortness.stdout b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
index 748113be3..6313dde32 100644
--- a/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
+++ b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
@@ -6,7 +6,7 @@ failures:
 
 ---- $DIR/issue-81662-shortness.rs - foo (line 6) stdout ----
 $DIR/issue-81662-shortness.rs:7:1: error[E0425]: cannot find function `foo` in this scope
-error: aborting due to previous error
+error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
diff --git a/tests/rustdoc-ui/issues/issue-96287.stderr b/tests/rustdoc-ui/issues/issue-96287.stderr
index c4809a311..62d81534a 100644
--- a/tests/rustdoc-ui/issues/issue-96287.stderr
+++ b/tests/rustdoc-ui/issues/issue-96287.stderr
@@ -9,6 +9,6 @@ help: consider restricting type parameter `V`
 LL | pub type Foo<V: TraitWithAssoc> = impl Trait<V::Assoc>;
    |               ++++++++++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0220`.