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 --- .../rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr | 2 +- tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ui/rfcs/rfc-2397-do-not-recommend') diff --git a/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr b/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr index a3e559054..6af1d4533 100644 --- a/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr +++ b/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr @@ -20,6 +20,6 @@ note: required by a bound in `stuff` LL | fn stuff(_: T) {} | ^^^ required by this bound in `stuff` -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-2397-do-not-recommend/unstable-feature.stderr b/tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr index 1597e5be4..b2c1406d0 100644 --- a/tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr +++ b/tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr @@ -7,6 +7,6 @@ LL | #[do_not_recommend] = note: see issue #51992 for more information = help: add `#![feature(do_not_recommend)]` 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