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/inline-const/const-expr-generic-err2.stderr | 2 +- tests/ui/inline-const/const-expr-lifetime-err.stderr | 2 +- tests/ui/inline-const/expr-unsafe-err.mir.stderr | 2 +- tests/ui/inline-const/expr-unsafe-err.thir.stderr | 2 +- tests/ui/inline-const/expr-with-block-err.stderr | 2 +- tests/ui/inline-const/pat-match-fndef.stderr | 2 +- tests/ui/inline-const/promotion.stderr | 2 +- tests/ui/inline-const/required-const.stderr | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/ui/inline-const') diff --git a/tests/ui/inline-const/const-expr-generic-err2.stderr b/tests/ui/inline-const/const-expr-generic-err2.stderr index 00b716cd2..5876a6c9e 100644 --- a/tests/ui/inline-const/const-expr-generic-err2.stderr +++ b/tests/ui/inline-const/const-expr-generic-err2.stderr @@ -6,5 +6,5 @@ LL | let _ = [0u8; const { std::mem::size_of::() }]; | = note: this may fail depending on what value the parameter takes -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/inline-const/const-expr-lifetime-err.stderr b/tests/ui/inline-const/const-expr-lifetime-err.stderr index 443fcf89c..75877bc09 100644 --- a/tests/ui/inline-const/const-expr-lifetime-err.stderr +++ b/tests/ui/inline-const/const-expr-lifetime-err.stderr @@ -14,6 +14,6 @@ LL | LL | } | - `y` dropped here while still borrowed -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0597`. diff --git a/tests/ui/inline-const/expr-unsafe-err.mir.stderr b/tests/ui/inline-const/expr-unsafe-err.mir.stderr index 1bec41e2e..ebd18f89d 100644 --- a/tests/ui/inline-const/expr-unsafe-err.mir.stderr +++ b/tests/ui/inline-const/expr-unsafe-err.mir.stderr @@ -6,6 +6,6 @@ LL | require_unsafe(); | = note: consult the function's documentation for information on how to avoid undefined behavior -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0133`. diff --git a/tests/ui/inline-const/expr-unsafe-err.thir.stderr b/tests/ui/inline-const/expr-unsafe-err.thir.stderr index c971e8afb..45f850d1f 100644 --- a/tests/ui/inline-const/expr-unsafe-err.thir.stderr +++ b/tests/ui/inline-const/expr-unsafe-err.thir.stderr @@ -6,6 +6,6 @@ LL | require_unsafe(); | = note: consult the function's documentation for information on how to avoid undefined behavior -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0133`. diff --git a/tests/ui/inline-const/expr-with-block-err.stderr b/tests/ui/inline-const/expr-with-block-err.stderr index 6f7408f4e..a46d73950 100644 --- a/tests/ui/inline-const/expr-with-block-err.stderr +++ b/tests/ui/inline-const/expr-with-block-err.stderr @@ -4,6 +4,6 @@ error[E0308]: mismatched types LL | const { 2 } - const { 1 }; | ^ expected `()`, found integer -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/inline-const/pat-match-fndef.stderr b/tests/ui/inline-const/pat-match-fndef.stderr index c94782b17..02c4a60b6 100644 --- a/tests/ui/inline-const/pat-match-fndef.stderr +++ b/tests/ui/inline-const/pat-match-fndef.stderr @@ -13,5 +13,5 @@ error: `fn() {uwu}` cannot be used in patterns LL | const { uwu } => {} | ^^^^^^^^^^^^^ -error: aborting due to previous error; 1 warning emitted +error: aborting due to 1 previous error; 1 warning emitted diff --git a/tests/ui/inline-const/promotion.stderr b/tests/ui/inline-const/promotion.stderr index 795fc8f59..7f06b9781 100644 --- a/tests/ui/inline-const/promotion.stderr +++ b/tests/ui/inline-const/promotion.stderr @@ -9,6 +9,6 @@ LL | LL | } | - temporary value is freed at the end of this statement -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0716`. diff --git a/tests/ui/inline-const/required-const.stderr b/tests/ui/inline-const/required-const.stderr index d6948e7ac..cd8602018 100644 --- a/tests/ui/inline-const/required-const.stderr +++ b/tests/ui/inline-const/required-const.stderr @@ -6,6 +6,6 @@ LL | const { panic!() } | = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (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 E0080`. -- cgit v1.2.3