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/wf/issue-103573.stderr | 2 +- tests/ui/wf/issue-87495.stderr | 2 +- tests/ui/wf/issue-95665.stderr | 2 +- tests/ui/wf/issue-96810.stderr | 2 +- tests/ui/wf/wf-array-elem-sized.stderr | 2 +- tests/ui/wf/wf-complex-assoc-type.stderr | 2 +- tests/ui/wf/wf-enum-bound.stderr | 2 +- tests/ui/wf/wf-enum-fields-struct-variant.stderr | 2 +- tests/ui/wf/wf-enum-fields.stderr | 2 +- tests/ui/wf/wf-impl-associated-type-region.stderr | 2 +- tests/ui/wf/wf-impl-associated-type-trait.stderr | 2 +- tests/ui/wf/wf-impl-self-type.stderr | 2 +- tests/ui/wf/wf-in-fn-arg.stderr | 2 +- tests/ui/wf/wf-in-fn-ret.stderr | 2 +- tests/ui/wf/wf-in-fn-type-arg.stderr | 2 +- tests/ui/wf/wf-in-fn-type-ret.stderr | 2 +- tests/ui/wf/wf-in-fn-where-clause.stderr | 2 +- tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr | 2 +- tests/ui/wf/wf-in-obj-type-static.stderr | 2 +- tests/ui/wf/wf-in-obj-type-trait.stderr | 2 +- tests/ui/wf/wf-inherent-impl-method-where-clause.stderr | 2 +- tests/ui/wf/wf-inherent-impl-where-clause.stderr | 2 +- tests/ui/wf/wf-object-safe.stderr | 2 +- tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr | 2 +- tests/ui/wf/wf-struct-bound.stderr | 2 +- tests/ui/wf/wf-struct-field.stderr | 2 +- tests/ui/wf/wf-trait-associated-type-bound.stderr | 2 +- tests/ui/wf/wf-trait-associated-type-region.stderr | 2 +- tests/ui/wf/wf-trait-associated-type-trait.stderr | 2 +- tests/ui/wf/wf-trait-bound.stderr | 2 +- tests/ui/wf/wf-trait-default-fn-arg.stderr | 2 +- tests/ui/wf/wf-trait-default-fn-ret.stderr | 2 +- tests/ui/wf/wf-trait-default-fn-where-clause.stderr | 2 +- tests/ui/wf/wf-trait-fn-arg.stderr | 2 +- tests/ui/wf/wf-trait-fn-ret.stderr | 2 +- tests/ui/wf/wf-trait-fn-where-clause.stderr | 2 +- tests/ui/wf/wf-trait-superbound.stderr | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) (limited to 'tests/ui/wf') diff --git a/tests/ui/wf/issue-103573.stderr b/tests/ui/wf/issue-103573.stderr index 5227badb7..3129f2a8c 100644 --- a/tests/ui/wf/issue-103573.stderr +++ b/tests/ui/wf/issue-103573.stderr @@ -9,6 +9,6 @@ help: consider further restricting the associated type LL | fn g<'a>(_: &< as TraitB>::TypeB as TraitA>::TypeA) where <>::TypeC<'a> as TraitB>::TypeB: TraitA; | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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/wf/issue-87495.stderr b/tests/ui/wf/issue-87495.stderr index c924cd879..3ccfd7f8d 100644 --- a/tests/ui/wf/issue-87495.stderr +++ b/tests/ui/wf/issue-87495.stderr @@ -13,6 +13,6 @@ LL | const CONST: (bool, dyn T); | ^^^^^ ...because it contains this associated `const` = help: consider moving `CONST` to another trait -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0038`. diff --git a/tests/ui/wf/issue-95665.stderr b/tests/ui/wf/issue-95665.stderr index f80cd41a4..1b14045d5 100644 --- a/tests/ui/wf/issue-95665.stderr +++ b/tests/ui/wf/issue-95665.stderr @@ -15,6 +15,6 @@ note: required by a bound in `Struct` LL | pub struct Struct { | ^^^^^ required by this bound in `Struct` -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/wf/issue-96810.stderr b/tests/ui/wf/issue-96810.stderr index 1407e62b1..622d72f79 100644 --- a/tests/ui/wf/issue-96810.stderr +++ b/tests/ui/wf/issue-96810.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `K` LL | struct Hoge { | ++++ -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/wf/wf-array-elem-sized.stderr b/tests/ui/wf/wf-array-elem-sized.stderr index 7f3c58d6b..6bca8d036 100644 --- a/tests/ui/wf/wf-array-elem-sized.stderr +++ b/tests/ui/wf/wf-array-elem-sized.stderr @@ -7,6 +7,6 @@ LL | foo: [[u8]], = help: the trait `Sized` is not implemented for `[u8]` = note: slice and array elements must have `Sized` type -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/wf/wf-complex-assoc-type.stderr b/tests/ui/wf/wf-complex-assoc-type.stderr index 6a623bec8..161ee9d70 100644 --- a/tests/ui/wf/wf-complex-assoc-type.stderr +++ b/tests/ui/wf/wf-complex-assoc-type.stderr @@ -15,6 +15,6 @@ note: required by a bound in `AssertMyTrait` LL | struct AssertMyTrait(T); | ^^^^^^^ required by this bound in `AssertMyTrait` -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/wf/wf-enum-bound.stderr b/tests/ui/wf/wf-enum-bound.stderr index d39fc0c6a..78b5c6ec2 100644 --- a/tests/ui/wf/wf-enum-bound.stderr +++ b/tests/ui/wf/wf-enum-bound.stderr @@ -14,6 +14,6 @@ help: consider further restricting type parameter `U` LL | where T: ExtraCopy, U: std::marker::Copy | ++++++++++++++++++++++ -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/wf/wf-enum-fields-struct-variant.stderr b/tests/ui/wf/wf-enum-fields-struct-variant.stderr index c12d62521..2f2c1c2d2 100644 --- a/tests/ui/wf/wf-enum-fields-struct-variant.stderr +++ b/tests/ui/wf/wf-enum-fields-struct-variant.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `A` LL | enum AnotherEnum { | +++++++++++++++++++ -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/wf/wf-enum-fields.stderr b/tests/ui/wf/wf-enum-fields.stderr index ac3301a96..a5feaadfc 100644 --- a/tests/ui/wf/wf-enum-fields.stderr +++ b/tests/ui/wf/wf-enum-fields.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `A` LL | enum SomeEnum { | +++++++++++++++++++ -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/wf/wf-impl-associated-type-region.stderr b/tests/ui/wf/wf-impl-associated-type-region.stderr index e6fb81247..f17d33474 100644 --- a/tests/ui/wf/wf-impl-associated-type-region.stderr +++ b/tests/ui/wf/wf-impl-associated-type-region.stderr @@ -11,6 +11,6 @@ help: consider adding an explicit lifetime bound LL | impl<'a, T: 'a> Foo<'a> for T { | ++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0309`. diff --git a/tests/ui/wf/wf-impl-associated-type-trait.stderr b/tests/ui/wf/wf-impl-associated-type-trait.stderr index bdf8bba5e..09e255bea 100644 --- a/tests/ui/wf/wf-impl-associated-type-trait.stderr +++ b/tests/ui/wf/wf-impl-associated-type-trait.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | impl Foo for T { | ++++++++ -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/wf/wf-impl-self-type.stderr b/tests/ui/wf/wf-impl-self-type.stderr index 1ca368729..86fe6df32 100644 --- a/tests/ui/wf/wf-impl-self-type.stderr +++ b/tests/ui/wf/wf-impl-self-type.stderr @@ -8,6 +8,6 @@ LL | impl Foo for Option<[u8]> {} note: required by a bound in `Option` --> $SRC_DIR/core/src/option.rs:LL:COL -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/wf/wf-in-fn-arg.stderr b/tests/ui/wf/wf-in-fn-arg.stderr index 83a4a592a..8f22edd17 100644 --- a/tests/ui/wf/wf-in-fn-arg.stderr +++ b/tests/ui/wf/wf-in-fn-arg.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | fn bar(_: &MustBeCopy) | +++++++++++++++++++ -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/wf/wf-in-fn-ret.stderr b/tests/ui/wf/wf-in-fn-ret.stderr index 7eeb97472..85cf78c59 100644 --- a/tests/ui/wf/wf-in-fn-ret.stderr +++ b/tests/ui/wf/wf-in-fn-ret.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | fn bar() -> MustBeCopy | +++++++++++++++++++ -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/wf/wf-in-fn-type-arg.stderr b/tests/ui/wf/wf-in-fn-type-arg.stderr index be5e9d418..17594c813 100644 --- a/tests/ui/wf/wf-in-fn-type-arg.stderr +++ b/tests/ui/wf/wf-in-fn-type-arg.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | struct Bar { | +++++++++++++++++++ -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/wf/wf-in-fn-type-ret.stderr b/tests/ui/wf/wf-in-fn-type-ret.stderr index 8fcfcb0b2..fac535a11 100644 --- a/tests/ui/wf/wf-in-fn-type-ret.stderr +++ b/tests/ui/wf/wf-in-fn-type-ret.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | struct Foo { | +++++++++++++++++++ -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/wf/wf-in-fn-where-clause.stderr b/tests/ui/wf/wf-in-fn-where-clause.stderr index 160a73840..4c556d3d7 100644 --- a/tests/ui/wf/wf-in-fn-where-clause.stderr +++ b/tests/ui/wf/wf-in-fn-where-clause.stderr @@ -14,6 +14,6 @@ help: consider further restricting type parameter `U` LL | where T: MustBeCopy, U: std::marker::Copy | ++++++++++++++++++++++ -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/wf/wf-in-foreign-fn-decls-issue-80468.stderr b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr index b10856571..0af4ab022 100644 --- a/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr +++ b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr @@ -9,6 +9,6 @@ help: indicate the anonymous lifetime LL | impl Trait for Ref<'_> {} | ++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0726`. diff --git a/tests/ui/wf/wf-in-obj-type-static.stderr b/tests/ui/wf/wf-in-obj-type-static.stderr index 4b9b18916..9e837b10e 100644 --- a/tests/ui/wf/wf-in-obj-type-static.stderr +++ b/tests/ui/wf/wf-in-obj-type-static.stderr @@ -12,6 +12,6 @@ help: consider adding an explicit lifetime bound LL | struct Foo { | +++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0310`. diff --git a/tests/ui/wf/wf-in-obj-type-trait.stderr b/tests/ui/wf/wf-in-obj-type-trait.stderr index f556b678e..b96f56a12 100644 --- a/tests/ui/wf/wf-in-obj-type-trait.stderr +++ b/tests/ui/wf/wf-in-obj-type-trait.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | struct Bar { | +++++++++++++++++++ -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/wf/wf-inherent-impl-method-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr index e723d1ba7..4cfbec12b 100644 --- a/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr +++ b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `U` LL | impl Foo { | +++++++++++++++++++ -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/wf/wf-inherent-impl-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-where-clause.stderr index 39e0d348e..bdc1ee3e0 100644 --- a/tests/ui/wf/wf-inherent-impl-where-clause.stderr +++ b/tests/ui/wf/wf-inherent-impl-where-clause.stderr @@ -14,6 +14,6 @@ help: consider further restricting type parameter `U` LL | impl Foo where T: ExtraCopy, U: std::marker::Copy | ++++++++++++++++++++++ -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/wf/wf-object-safe.stderr b/tests/ui/wf/wf-object-safe.stderr index 64969fbe3..cc5351346 100644 --- a/tests/ui/wf/wf-object-safe.stderr +++ b/tests/ui/wf/wf-object-safe.stderr @@ -13,6 +13,6 @@ LL | fn foo(&self, _x: &Self); | ^^^^^ ...because method `foo` references the `Self` type in this parameter = help: consider moving `foo` to another trait -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0038`. diff --git a/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr index 52f46562c..8e3088c6f 100644 --- a/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr +++ b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr @@ -10,6 +10,6 @@ help: this trait has no implementations, consider adding one LL | pub trait Allocator { type Buffer; } | ^^^^^^^^^^^^^^^^^^^ -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/wf/wf-struct-bound.stderr b/tests/ui/wf/wf-struct-bound.stderr index 6248e3e4e..4ac7f4634 100644 --- a/tests/ui/wf/wf-struct-bound.stderr +++ b/tests/ui/wf/wf-struct-bound.stderr @@ -14,6 +14,6 @@ help: consider further restricting type parameter `U` LL | where T: ExtraCopy, U: std::marker::Copy | ++++++++++++++++++++++ -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/wf/wf-struct-field.stderr b/tests/ui/wf/wf-struct-field.stderr index 78a8da860..241ced3c2 100644 --- a/tests/ui/wf/wf-struct-field.stderr +++ b/tests/ui/wf/wf-struct-field.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `A` LL | struct SomeStruct { | +++++++++++++++++++ -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/wf/wf-trait-associated-type-bound.stderr b/tests/ui/wf/wf-trait-associated-type-bound.stderr index 829770017..4ea895a9b 100644 --- a/tests/ui/wf/wf-trait-associated-type-bound.stderr +++ b/tests/ui/wf/wf-trait-associated-type-bound.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | trait SomeTrait { | +++++++++++++++++++ -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/wf/wf-trait-associated-type-region.stderr b/tests/ui/wf/wf-trait-associated-type-region.stderr index ca7aeb55b..d6647b2cb 100644 --- a/tests/ui/wf/wf-trait-associated-type-region.stderr +++ b/tests/ui/wf/wf-trait-associated-type-region.stderr @@ -12,6 +12,6 @@ help: consider adding an explicit lifetime bound LL | type Type2 = &'a Self::Type1 where >::Type1: 'a; | ++++++++++++++++++++++++++++++++++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0309`. diff --git a/tests/ui/wf/wf-trait-associated-type-trait.stderr b/tests/ui/wf/wf-trait-associated-type-trait.stderr index a73c3a2ae..1dc8e2d87 100644 --- a/tests/ui/wf/wf-trait-associated-type-trait.stderr +++ b/tests/ui/wf/wf-trait-associated-type-trait.stderr @@ -14,6 +14,6 @@ help: consider further restricting the associated type LL | trait SomeTrait where ::Type1: Copy { | ++++++++++++++++++++++++++++++++++++++ -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/wf/wf-trait-bound.stderr b/tests/ui/wf/wf-trait-bound.stderr index bace3e3ef..5845d05b3 100644 --- a/tests/ui/wf/wf-trait-bound.stderr +++ b/tests/ui/wf/wf-trait-bound.stderr @@ -14,6 +14,6 @@ help: consider further restricting type parameter `U` LL | where T: ExtraCopy, U: std::marker::Copy | ++++++++++++++++++++++ -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/wf/wf-trait-default-fn-arg.stderr b/tests/ui/wf/wf-trait-default-fn-arg.stderr index 8c3d0568f..a885f8988 100644 --- a/tests/ui/wf/wf-trait-default-fn-arg.stderr +++ b/tests/ui/wf/wf-trait-default-fn-arg.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self, x: &Bar) where Self: Eq { | ++++++++++++++ -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/wf/wf-trait-default-fn-ret.stderr b/tests/ui/wf/wf-trait-default-fn-ret.stderr index 6422e862d..f749ac7b1 100644 --- a/tests/ui/wf/wf-trait-default-fn-ret.stderr +++ b/tests/ui/wf/wf-trait-default-fn-ret.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self) -> Bar where Self: Eq { | ++++++++++++++ -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/wf/wf-trait-default-fn-where-clause.stderr b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr index f260d5750..e44a96fa5 100644 --- a/tests/ui/wf/wf-trait-default-fn-where-clause.stderr +++ b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self) where A: Bar, Self: Eq { | ++++++++++ -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/wf/wf-trait-fn-arg.stderr b/tests/ui/wf/wf-trait-fn-arg.stderr index 3bd1f4892..8b35f36fa 100644 --- a/tests/ui/wf/wf-trait-fn-arg.stderr +++ b/tests/ui/wf/wf-trait-fn-arg.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self, x: &Bar) where Self: Eq; | ++++++++++++++ -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/wf/wf-trait-fn-ret.stderr b/tests/ui/wf/wf-trait-fn-ret.stderr index 9bd3cc771..3d70f04de 100644 --- a/tests/ui/wf/wf-trait-fn-ret.stderr +++ b/tests/ui/wf/wf-trait-fn-ret.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self) -> &Bar where Self: Eq; | ++++++++++++++ -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/wf/wf-trait-fn-where-clause.stderr b/tests/ui/wf/wf-trait-fn-where-clause.stderr index d064f7fc5..0ad3b58e7 100644 --- a/tests/ui/wf/wf-trait-fn-where-clause.stderr +++ b/tests/ui/wf/wf-trait-fn-where-clause.stderr @@ -14,6 +14,6 @@ help: consider further restricting `Self` LL | fn bar(&self) where Self: Sized, Bar: Copy, Self: Eq; | ++++++++++ -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/wf/wf-trait-superbound.stderr b/tests/ui/wf/wf-trait-superbound.stderr index cd49243a4..3c05065e5 100644 --- a/tests/ui/wf/wf-trait-superbound.stderr +++ b/tests/ui/wf/wf-trait-superbound.stderr @@ -14,6 +14,6 @@ help: consider restricting type parameter `T` LL | trait SomeTrait: ExtraCopy { | +++++++++++++++++++ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. -- cgit v1.2.3