diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
| commit | 9918693037dce8aa4bb6f08741b6812923486c18 (patch) | |
| tree | 21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /tests/ui/panic-runtime | |
| parent | Releasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff) | |
| download | rustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ui/panic-runtime')
4 files changed, 4 insertions, 4 deletions
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 |