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/enum/enum-and-module-in-same-scope.stderr | 2 +- tests/ui/enum/enum-discrim-autosizing.stderr | 2 +- tests/ui/enum/enum-in-scope.stderr | 2 +- tests/ui/enum/enum-variant-type-2.stderr | 2 +- tests/ui/enum/suggest-default-attribute.stderr | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/ui/enum') diff --git a/tests/ui/enum/enum-and-module-in-same-scope.stderr b/tests/ui/enum/enum-and-module-in-same-scope.stderr index 538898c2f..0293acd62 100644 --- a/tests/ui/enum/enum-and-module-in-same-scope.stderr +++ b/tests/ui/enum/enum-and-module-in-same-scope.stderr @@ -9,6 +9,6 @@ LL | mod Foo { | = note: `Foo` must be defined only once in the type namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0428`. diff --git a/tests/ui/enum/enum-discrim-autosizing.stderr b/tests/ui/enum/enum-discrim-autosizing.stderr index be3d7c64e..03c722a68 100644 --- a/tests/ui/enum/enum-discrim-autosizing.stderr +++ b/tests/ui/enum/enum-discrim-autosizing.stderr @@ -10,6 +10,6 @@ LL | LL | Bu64 = 0x8000_0000_0000_0000 | --------------------- `0` (overflowed from `9223372036854775808`) assigned here -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0081`. diff --git a/tests/ui/enum/enum-in-scope.stderr b/tests/ui/enum/enum-in-scope.stderr index 49a01abcb..9c0dd8f3d 100644 --- a/tests/ui/enum/enum-in-scope.stderr +++ b/tests/ui/enum/enum-in-scope.stderr @@ -7,6 +7,6 @@ LL | struct hello(isize); LL | let hello = 0; | ^^^^^ cannot be named the same as a tuple struct -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0530`. diff --git a/tests/ui/enum/enum-variant-type-2.stderr b/tests/ui/enum/enum-variant-type-2.stderr index 7e8453c61..216dbda5d 100644 --- a/tests/ui/enum/enum-variant-type-2.stderr +++ b/tests/ui/enum/enum-variant-type-2.stderr @@ -7,6 +7,6 @@ LL | fn foo(x: Foo::Bar) {} | not a type | help: try using the variant's enum: `Foo` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0573`. diff --git a/tests/ui/enum/suggest-default-attribute.stderr b/tests/ui/enum/suggest-default-attribute.stderr index b56d599a7..fa72db6aa 100644 --- a/tests/ui/enum/suggest-default-attribute.stderr +++ b/tests/ui/enum/suggest-default-attribute.stderr @@ -10,5 +10,5 @@ LL + #[derive(Default)] LL | pub enum Test { | -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3