From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr | 2 +- tests/ui/panic-runtime/need-abort-got-unwind.stderr | 2 +- tests/ui/panic-runtime/need-unwind-got-abort.stderr | 2 +- tests/ui/panic-runtime/want-unwind-got-abort.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ui/panic-runtime') diff --git a/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr index 704b81ae1..bea1172f0 100644 --- a/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr +++ b/tests/ui/panic-runtime/abort-link-to-unwind-dylib.stderr @@ -1,4 +1,4 @@ error: the linked panic runtime `panic_unwind` is not compiled with this crate's panic strategy `abort` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/panic-runtime/need-abort-got-unwind.stderr b/tests/ui/panic-runtime/need-abort-got-unwind.stderr index d29c7875f..2a13f45c1 100644 --- a/tests/ui/panic-runtime/need-abort-got-unwind.stderr +++ b/tests/ui/panic-runtime/need-abort-got-unwind.stderr @@ -1,4 +1,4 @@ error: the crate `needs_abort` requires panic strategy `abort` which is incompatible with this crate's strategy of `unwind` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/panic-runtime/need-unwind-got-abort.stderr b/tests/ui/panic-runtime/need-unwind-got-abort.stderr index 4c71df3eb..2a0647fe7 100644 --- a/tests/ui/panic-runtime/need-unwind-got-abort.stderr +++ b/tests/ui/panic-runtime/need-unwind-got-abort.stderr @@ -1,4 +1,4 @@ error: the crate `needs_unwind` requires panic strategy `unwind` which is incompatible with this crate's strategy of `abort` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/panic-runtime/want-unwind-got-abort.stderr b/tests/ui/panic-runtime/want-unwind-got-abort.stderr index d306ce6c5..ced0a7610 100644 --- a/tests/ui/panic-runtime/want-unwind-got-abort.stderr +++ b/tests/ui/panic-runtime/want-unwind-got-abort.stderr @@ -1,4 +1,4 @@ error: the linked panic runtime `panic_runtime_abort` is not compiled with this crate's panic strategy `unwind` -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3