Merging upstream version 1.76.0+dfsg1.

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

11 files changed, 16 insertions, 13 deletions

diff --git a/tests/ui/duplicate/dupe-symbols-1.stderr b/tests/ui/duplicate/dupe-symbols-1.stderr
index 933ed5e89..03ebc9d6e 100644
--- a/tests/ui/duplicate/dupe-symbols-1.stderr
+++ b/tests/ui/duplicate/dupe-symbols-1.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL | pub fn b() {
    | ^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-2.stderr b/tests/ui/duplicate/dupe-symbols-2.stderr
index b132eae4b..091c3051e 100644
--- a/tests/ui/duplicate/dupe-symbols-2.stderr
+++ b/tests/ui/duplicate/dupe-symbols-2.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL |     pub extern "C" fn fail() {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-3.stderr b/tests/ui/duplicate/dupe-symbols-3.stderr
index 6300b4908..9417f8817 100644
--- a/tests/ui/duplicate/dupe-symbols-3.stderr
+++ b/tests/ui/duplicate/dupe-symbols-3.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL | pub fn fail() {
    | ^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-4.stderr b/tests/ui/duplicate/dupe-symbols-4.stderr
index 1407a4883..4c5f1e786 100644
--- a/tests/ui/duplicate/dupe-symbols-4.stderr
+++ b/tests/ui/duplicate/dupe-symbols-4.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL |     fn fail(self) {}
    |     ^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-5.stderr b/tests/ui/duplicate/dupe-symbols-5.stderr
index 558f868a0..74c296e33 100644
--- a/tests/ui/duplicate/dupe-symbols-5.stderr
+++ b/tests/ui/duplicate/dupe-symbols-5.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL | pub fn b() {
    | ^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-6.stderr b/tests/ui/duplicate/dupe-symbols-6.stderr
index 6692a63dc..2be681327 100644
--- a/tests/ui/duplicate/dupe-symbols-6.stderr
+++ b/tests/ui/duplicate/dupe-symbols-6.stderr
@@ -4,5 +4,5 @@ error: symbol `fail` is already defined
 LL | static HELLO_TWICE: u16 = 0;
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-7.stderr b/tests/ui/duplicate/dupe-symbols-7.stderr
index cd5147c0e..23f74ef75 100644
--- a/tests/ui/duplicate/dupe-symbols-7.stderr
+++ b/tests/ui/duplicate/dupe-symbols-7.stderr
@@ -6,5 +6,5 @@ LL | fn main(){}
    |
    = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/dupe-symbols-8.stderr b/tests/ui/duplicate/dupe-symbols-8.stderr
index 8d6a79e12..67eb0bc71 100644
--- a/tests/ui/duplicate/dupe-symbols-8.stderr
+++ b/tests/ui/duplicate/dupe-symbols-8.stderr
@@ -6,5 +6,5 @@ LL | fn main() {
    |
    = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/duplicate-check-macro-exports.stderr b/tests/ui/duplicate/duplicate-check-macro-exports.stderr
index ba723b38b..eff19c090 100644
--- a/tests/ui/duplicate/duplicate-check-macro-exports.stderr
+++ b/tests/ui/duplicate/duplicate-check-macro-exports.stderr
@@ -13,6 +13,6 @@ help: you can use `as` to change the binding name of the import
 LL | pub use std::panic as other_panic;
    |         ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0255`.
diff --git a/tests/ui/duplicate/duplicate-parameter.stderr b/tests/ui/duplicate/duplicate-parameter.stderr
index f3ef0bcf3..413d8b6f8 100644
--- a/tests/ui/duplicate/duplicate-parameter.stderr
+++ b/tests/ui/duplicate/duplicate-parameter.stderr
@@ -4,6 +4,6 @@ error[E0415]: identifier `a` is bound more than once in this parameter list
 LL | fn f(a: isize, a: isize) {}
    |                ^ used as parameter more than once
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0415`.
diff --git a/tests/ui/duplicate_entry_error.stderr b/tests/ui/duplicate_entry_error.stderr
index 6d078dfbd..3b5998df3 100644
--- a/tests/ui/duplicate_entry_error.stderr
+++ b/tests/ui/duplicate_entry_error.stderr
@@ -1,13 +1,16 @@
 error[E0152]: found duplicate lang item `panic_impl`
   --> $DIR/duplicate_entry_error.rs:11:1
    |
-LL | fn panic_impl(info: &PanicInfo) -> ! {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | / fn panic_impl(info: &PanicInfo) -> ! {
+LL | |
+LL | |     loop {}
+LL | | }
+   | |_^
    |
    = note: the lang item is first defined in crate `std` (which `duplicate_entry_error` depends on)
    = note: first definition in `std` loaded from SYSROOT/libstd-*.rlib
    = note: second definition in the local crate (`duplicate_entry_error`)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0152`.