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/track-diagnostics/track2.stderr | 2 +- tests/ui/track-diagnostics/track4.stderr | 2 +- tests/ui/track-diagnostics/track5.stderr | 2 +- tests/ui/track-diagnostics/track6.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ui/track-diagnostics') diff --git a/tests/ui/track-diagnostics/track2.stderr b/tests/ui/track-diagnostics/track2.stderr index fe13e5ef3..dffa0b0c9 100644 --- a/tests/ui/track-diagnostics/track2.stderr +++ b/tests/ui/track-diagnostics/track2.stderr @@ -13,6 +13,6 @@ help: borrow this binding in the pattern to avoid moving the value LL | let ref _moved @ ref _from = String::from("foo"); | +++ +++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0382`. diff --git a/tests/ui/track-diagnostics/track4.stderr b/tests/ui/track-diagnostics/track4.stderr index 9ebf222ee..d9eaea936 100644 --- a/tests/ui/track-diagnostics/track4.stderr +++ b/tests/ui/track-diagnostics/track4.stderr @@ -10,5 +10,5 @@ help: add `struct` here to parse `onion` as a public struct LL | pub struct onion { | ++++++ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/track-diagnostics/track5.stderr b/tests/ui/track-diagnostics/track5.stderr index aa54f92b6..ecc7d81b3 100644 --- a/tests/ui/track-diagnostics/track5.stderr +++ b/tests/ui/track-diagnostics/track5.stderr @@ -5,5 +5,5 @@ LL | } | ^ unexpected closing delimiter -Ztrack-diagnostics: created at compiler/rustc_parse/src/lexer/tokentrees.rs:LL:CC -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/track-diagnostics/track6.stderr b/tests/ui/track-diagnostics/track6.stderr index 583b02555..8ca56d6db 100644 --- a/tests/ui/track-diagnostics/track6.stderr +++ b/tests/ui/track-diagnostics/track6.stderr @@ -8,6 +8,6 @@ LL | default fn bar() {} = note: see issue #31844 for more information = help: add `#![feature(specialization)]` to the crate attributes to enable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0658`. -- cgit v1.2.3