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/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr | 2 +- tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr | 2 +- tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr | 2 +- tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.stderr | 2 +- .../rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr | 2 +- .../termination-trait-in-test-should-panic.stderr | 2 +- .../rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr | 2 +- .../rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr | 2 +- .../rfc-1937-termination-trait/termination-trait-not-satisfied.stderr | 2 +- .../rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/ui/rfcs/rfc-1937-termination-trait') diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr index 409dede1a..6c3d576cf 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr @@ -12,6 +12,6 @@ note: required by a bound in `receive` LL | fn receive(_: impl std::process::Termination) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `receive` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr index f72b3ab02..f2727336b 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr @@ -10,6 +10,6 @@ note: required by a bound in `Main::main::{opaque#0}` LL | fn main() -> impl std::process::Termination; | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::main::{opaque#0}` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr index 8b01941b4..4bb420664 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr @@ -10,6 +10,6 @@ note: required by a bound in `Main::{opaque#0}` LL | fn main() -> impl std::process::Termination; | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::{opaque#0}` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.stderr index 40f736c21..3fbbfd0fd 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.stderr @@ -10,6 +10,6 @@ note: required by a bound in `Main::{opaque#0}` LL | fn main() -> impl std::process::Termination; | ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::{opaque#0}` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr index 5ee6d127e..f562b97c3 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr @@ -6,6 +6,6 @@ LL | fn main() -> impl Copy { } | = help: consider using `()`, or a `Result` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr index 7f6749fc9..534599b74 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr @@ -8,5 +8,5 @@ LL | | Ok(()) LL | | } | |_^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr index 53779d365..fdbb0e655 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr @@ -6,6 +6,6 @@ LL | fn main() -> i32 { | = help: consider using `()`, or a `Result` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr index bc8fd92ce..7ed17dff1 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr @@ -6,6 +6,6 @@ LL | fn main() -> char { | = help: consider using `()`, or a `Result` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr index cb329548d..1b842c206 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr @@ -6,6 +6,6 @@ LL | fn main() -> ReturnType { | = help: consider using `()`, or a `Result` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr index a19750cc7..0a703367d 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr @@ -11,6 +11,6 @@ note: required by a bound in `assert_test_result` --> $SRC_DIR/test/src/lib.rs:LL:COL = note: this error originates in the attribute macro `test` (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 E0277`. -- cgit v1.2.3