From 018c4950b9406055dec02ef0fb52f132e2bb1e2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:25:56 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr | 2 +- tests/ui/test-attrs/issue-109816.stderr | 2 +- tests/ui/test-attrs/issue-12997-2.stderr | 2 +- tests/ui/test-attrs/test-panic-abort-disabled.stderr | 2 +- tests/ui/test-attrs/test-warns-dead-code.stderr | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/ui/test-attrs') diff --git a/tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr b/tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr index bd604afb7..6ac79924d 100644 --- a/tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr +++ b/tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr @@ -11,5 +11,5 @@ LL | #![deny(unnameable_test_items)] | ^^^^^^^^^^^^^^^^^^^^^ = note: this error originates in the attribute macro `test_case` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/test-attrs/issue-109816.stderr b/tests/ui/test-attrs/issue-109816.stderr index e69932875..6f5e3ae6b 100644 --- a/tests/ui/test-attrs/issue-109816.stderr +++ b/tests/ui/test-attrs/issue-109816.stderr @@ -12,5 +12,5 @@ help: replace with conditional compilation to make the item only exist when test LL | #[cfg(test)] | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/test-attrs/issue-12997-2.stderr b/tests/ui/test-attrs/issue-12997-2.stderr index 2a3d0e345..bc84ff413 100644 --- a/tests/ui/test-attrs/issue-12997-2.stderr +++ b/tests/ui/test-attrs/issue-12997-2.stderr @@ -16,6 +16,6 @@ LL | fn bar(x: isize) { } | ^^^ -------- = note: this error originates in the attribute macro `bench` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/test-attrs/test-panic-abort-disabled.stderr b/tests/ui/test-attrs/test-panic-abort-disabled.stderr index 9c65c7360..c6aeb41f5 100644 --- a/tests/ui/test-attrs/test-panic-abort-disabled.stderr +++ b/tests/ui/test-attrs/test-panic-abort-disabled.stderr @@ -1,4 +1,4 @@ error: building tests with panic=abort is not supported without `-Zpanic_abort_tests` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/test-attrs/test-warns-dead-code.stderr b/tests/ui/test-attrs/test-warns-dead-code.stderr index 6c0f28841..1c58e3885 100644 --- a/tests/ui/test-attrs/test-warns-dead-code.stderr +++ b/tests/ui/test-attrs/test-warns-dead-code.stderr @@ -10,5 +10,5 @@ note: the lint level is defined here LL | #![deny(dead_code)] | ^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3