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/unresolved/unresolved-asterisk-imports.stderr | 2 +- tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr | 2 +- tests/ui/unresolved/unresolved-import-recovery.stderr | 2 +- .../unresolved-import-suggest-disambiguated-crate-name.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ui/unresolved') diff --git a/tests/ui/unresolved/unresolved-asterisk-imports.stderr b/tests/ui/unresolved/unresolved-asterisk-imports.stderr index 8df8eab34..24ac2f8e6 100644 --- a/tests/ui/unresolved/unresolved-asterisk-imports.stderr +++ b/tests/ui/unresolved/unresolved-asterisk-imports.stderr @@ -6,6 +6,6 @@ LL | use not_existing_crate::*; | = help: consider adding `extern crate not_existing_crate` to use the `not_existing_crate` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr b/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr index 28333228a..b493d0fa3 100644 --- a/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr +++ b/tests/ui/unresolved/unresolved-extern-mod-suggestion.stderr @@ -8,6 +8,6 @@ LL | use core; | = note: `core` 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 E0254`. diff --git a/tests/ui/unresolved/unresolved-import-recovery.stderr b/tests/ui/unresolved/unresolved-import-recovery.stderr index 5e371b70b..1c0060497 100644 --- a/tests/ui/unresolved/unresolved-import-recovery.stderr +++ b/tests/ui/unresolved/unresolved-import-recovery.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `unresolved` LL | pub use unresolved; | ^^^^^^^^^^ no `unresolved` in the root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/unresolved/unresolved-import-suggest-disambiguated-crate-name.stderr b/tests/ui/unresolved/unresolved-import-suggest-disambiguated-crate-name.stderr index f139c0f3c..c6812dbb1 100644 --- a/tests/ui/unresolved/unresolved-import-suggest-disambiguated-crate-name.stderr +++ b/tests/ui/unresolved/unresolved-import-suggest-disambiguated-crate-name.stderr @@ -9,6 +9,6 @@ help: consider importing this struct instead LL | pub use ::library::SomeUsefulType; | ~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. -- cgit v1.2.3