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/for/for-c-in-str.stderr | 2 +- tests/ui/for/for-else-err.stderr | 2 +- tests/ui/for/for-else-let-else-err.stderr | 2 +- tests/ui/for/for-expn.stderr | 2 +- tests/ui/for/for-loop-bogosity.stderr | 2 +- tests/ui/for/for-loop-refutable-pattern-error-message.stderr | 2 +- tests/ui/for/for-loop-type-error.stderr | 2 +- tests/ui/for/for-loop-unconstrained-element-type.stderr | 2 +- tests/ui/for/issue-20605.current.stderr | 2 +- tests/ui/for/issue-20605.rs | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/ui/for') diff --git a/tests/ui/for/for-c-in-str.stderr b/tests/ui/for/for-c-in-str.stderr index 959a7c43f..475cf8c88 100644 --- a/tests/ui/for/for-c-in-str.stderr +++ b/tests/ui/for/for-c-in-str.stderr @@ -7,6 +7,6 @@ LL | for c in "asdf" { = help: the trait `Iterator` is not implemented for `&str` = note: required for `&str` to implement `IntoIterator` -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/for/for-else-err.stderr b/tests/ui/for/for-else-err.stderr index b330d1076..bd49dc472 100644 --- a/tests/ui/for/for-else-err.stderr +++ b/tests/ui/for/for-else-err.stderr @@ -13,5 +13,5 @@ LL | | } | = note: consider moving this `else` clause to a separate `if` statement and use a `bool` variable to control if it should run -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/for/for-else-let-else-err.stderr b/tests/ui/for/for-else-let-else-err.stderr index a2396a8fb..bb6558739 100644 --- a/tests/ui/for/for-else-let-else-err.stderr +++ b/tests/ui/for/for-else-let-else-err.stderr @@ -13,5 +13,5 @@ LL | | }; | = note: consider moving this `else` clause to a separate `if` statement and use a `bool` variable to control if it should run -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/for/for-expn.stderr b/tests/ui/for/for-expn.stderr index cdb211555..008223240 100644 --- a/tests/ui/for/for-expn.stderr +++ b/tests/ui/for/for-expn.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find value `foo` in this scope LL | foo | ^^^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/for/for-loop-bogosity.stderr b/tests/ui/for/for-loop-bogosity.stderr index 9bf8056e8..194a2fa08 100644 --- a/tests/ui/for/for-loop-bogosity.stderr +++ b/tests/ui/for/for-loop-bogosity.stderr @@ -7,6 +7,6 @@ LL | for x in bogus { = help: the trait `Iterator` is not implemented for `MyStruct` = note: required for `MyStruct` to implement `IntoIterator` -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/for/for-loop-refutable-pattern-error-message.stderr b/tests/ui/for/for-loop-refutable-pattern-error-message.stderr index 49a82a676..2082603d2 100644 --- a/tests/ui/for/for-loop-refutable-pattern-error-message.stderr +++ b/tests/ui/for/for-loop-refutable-pattern-error-message.stderr @@ -6,6 +6,6 @@ LL | for &1 in [1].iter() {} | = note: the matched value is of type `&i32` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0005`. diff --git a/tests/ui/for/for-loop-type-error.stderr b/tests/ui/for/for-loop-type-error.stderr index c93a3b9b2..393becd1b 100644 --- a/tests/ui/for/for-loop-type-error.stderr +++ b/tests/ui/for/for-loop-type-error.stderr @@ -6,6 +6,6 @@ LL | let x = () + (); | | | () -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0369`. diff --git a/tests/ui/for/for-loop-unconstrained-element-type.stderr b/tests/ui/for/for-loop-unconstrained-element-type.stderr index b1b38f6b9..3add3ae2e 100644 --- a/tests/ui/for/for-loop-unconstrained-element-type.stderr +++ b/tests/ui/for/for-loop-unconstrained-element-type.stderr @@ -9,6 +9,6 @@ help: consider specifying the generic argument LL | for i in Vec::::new() { } | +++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0282`. diff --git a/tests/ui/for/issue-20605.current.stderr b/tests/ui/for/issue-20605.current.stderr index b9a53cbd4..c8d39afde 100644 --- a/tests/ui/for/issue-20605.current.stderr +++ b/tests/ui/for/issue-20605.current.stderr @@ -11,6 +11,6 @@ help: consider mutably borrowing here LL | for item in &mut *things { *item = 0 } | ++++ -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/for/issue-20605.rs b/tests/ui/for/issue-20605.rs index 50d4c3fdd..8ae9494fa 100644 --- a/tests/ui/for/issue-20605.rs +++ b/tests/ui/for/issue-20605.rs @@ -1,5 +1,5 @@ // revisions: current next -//[next] compile-flags: -Ztrait-solver=next +//[next] compile-flags: -Znext-solver fn changer<'a>(mut things: Box>) { for item in *things { *item = 0 } @@ -13,7 +13,7 @@ fn changer<'a>(mut things: Box>) { //[next]~| ERROR the type `Option<< as IntoIterator>::IntoIter as Iterator>::Item>` is not well-formed //[next]~| ERROR the size for values of type `< as IntoIterator>::IntoIter as Iterator>::Item` cannot be known at compilation time //[next]~| ERROR type `< as IntoIterator>::IntoIter as Iterator>::Item` cannot be dereferenced - // FIXME(-Ztrait-solver=next): these error messages are horrible and have to be + // FIXME(-Znext-solver): these error messages are horrible and have to be // improved before we stabilize the new solver. } -- cgit v1.2.3