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 --- .../ui/associated-item/ambiguous-associated-type-with-generics.stderr | 2 +- tests/ui/associated-item/associated-item-duplicate-bounds.stderr | 4 ++-- tests/ui/associated-item/associated-item-duplicate-names-2.stderr | 2 +- tests/ui/associated-item/impl-duplicate-methods.stderr | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/ui/associated-item') diff --git a/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr b/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr index f7a47be8d..9e1dd7398 100644 --- a/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr +++ b/tests/ui/associated-item/ambiguous-associated-type-with-generics.stderr @@ -4,6 +4,6 @@ error[E0223]: ambiguous associated type LL | let _x: >::Ty; | ^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: ` as Assoc>::Ty` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0223`. diff --git a/tests/ui/associated-item/associated-item-duplicate-bounds.stderr b/tests/ui/associated-item/associated-item-duplicate-bounds.stderr index f2e4ca524..889888058 100644 --- a/tests/ui/associated-item/associated-item-duplicate-bounds.stderr +++ b/tests/ui/associated-item/associated-item-duplicate-bounds.stderr @@ -5,7 +5,7 @@ LL | links: [u32; A::LINKS], // Shouldn't suggest bounds already there. | ^^^^^^^^ cannot perform const operation using `A` | = note: type parameters may not be used in const expressions - = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions + = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/associated-item/associated-item-duplicate-names-2.stderr b/tests/ui/associated-item/associated-item-duplicate-names-2.stderr index 0b96a6bd7..ee0686b0f 100644 --- a/tests/ui/associated-item/associated-item-duplicate-names-2.stderr +++ b/tests/ui/associated-item/associated-item-duplicate-names-2.stderr @@ -6,6 +6,6 @@ LL | const bar: bool = true; LL | fn bar() {} | ^^^^^^^^ duplicate definitions for `bar` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0592`. diff --git a/tests/ui/associated-item/impl-duplicate-methods.stderr b/tests/ui/associated-item/impl-duplicate-methods.stderr index 6f753845a..fbd243400 100644 --- a/tests/ui/associated-item/impl-duplicate-methods.stderr +++ b/tests/ui/associated-item/impl-duplicate-methods.stderr @@ -6,6 +6,6 @@ LL | fn orange(&self) {} LL | fn orange(&self) {} | ^^^^^^^^^^^^^^^^ duplicate definitions for `orange` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0592`. -- cgit v1.2.3