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/attributes/unix_sigpipe/unix_sigpipe-crate.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr | 2 +- tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/ui/attributes/unix_sigpipe') diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr index 225b8e8f3..1666f4a3e 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr @@ -13,5 +13,5 @@ LL - #![unix_sigpipe = "inherit"] LL + #[unix_sigpipe = "inherit"] | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr index 2362c17a0..931aae96b 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr @@ -10,5 +10,5 @@ note: attribute also specified here LL | #[unix_sigpipe = "sig_ign"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr index 59a87e139..b1d79d7c2 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr @@ -11,5 +11,5 @@ LL | #[unix_sigpipe = "inherit|sig_ign|sig_dfl"] LL | #[unix_sigpipe] | ~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr index c4b81118c..124141b65 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr @@ -4,5 +4,5 @@ error: `unix_sigpipe` attribute can only be used on `fn main()` LL | #[unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr index a04f605ed..346d83fa6 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr @@ -4,5 +4,5 @@ error: `unix_sigpipe` attribute can only be used on root `fn main()` LL | #[unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr index 2c9ce479b..9f691e396 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr @@ -4,5 +4,5 @@ error: `unix_sigpipe` attribute can only be used on `fn main()` LL | #[unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr index c56ee60bb..d5eec9424 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr @@ -4,5 +4,5 @@ error: `unix_sigpipe` attribute can only be used on `fn main()` LL | #[unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr index a66e45aa2..d750443e4 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr @@ -4,5 +4,5 @@ error: valid values for `#[unix_sigpipe = "..."]` are `inherit`, `sig_ign`, or ` LL | #[unix_sigpipe = "wrong"] | ^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr index 1b1eda825..b18ec9abc 100644 --- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr +++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr @@ -4,5 +4,5 @@ error: valid values for `#[unix_sigpipe = "..."]` are `inherit`, `sig_ign`, or ` LL | #[unix_sigpipe] | ^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3