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/macros/macro-path-prelude-shadowing.stderr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/ui/macros/macro-path-prelude-shadowing.stderr') diff --git a/tests/ui/macros/macro-path-prelude-shadowing.stderr b/tests/ui/macros/macro-path-prelude-shadowing.stderr index 4a864c2e9..e719c397f 100644 --- a/tests/ui/macros/macro-path-prelude-shadowing.stderr +++ b/tests/ui/macros/macro-path-prelude-shadowing.stderr @@ -14,6 +14,6 @@ LL | use m2::*; // glob-import user-defined `std` = help: consider adding an explicit import of `std` to disambiguate = help: or use `self::std` to refer to this module unambiguously -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. -- cgit v1.2.3