diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:25:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:25:56 +0000 |
| commit | 018c4950b9406055dec02ef0fb52f132e2bb1e2c (patch) | |
| tree | a835ebdf2088ef88fa681f8fad45f09922c1ae9a /tests/ui/compare-method | |
| parent | Adding debian version 1.75.0+dfsg1-5. (diff) | |
| download | rustc-018c4950b9406055dec02ef0fb52f132e2bb1e2c.tar.xz rustc-018c4950b9406055dec02ef0fb52f132e2bb1e2c.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ui/compare-method')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/compare-method/proj-outlives-region.stderr b/tests/ui/compare-method/proj-outlives-region.stderr index 797a81679..b349e24f5 100644 --- a/tests/ui/compare-method/proj-outlives-region.stderr +++ b/tests/ui/compare-method/proj-outlives-region.stderr @@ -7,6 +7,6 @@ LL | fn foo() where T: 'a; LL | fn foo() where U: 'a { } | ^^ impl has extra requirement `U: 'a` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. diff --git a/tests/ui/compare-method/region-extra-2.stderr b/tests/ui/compare-method/region-extra-2.stderr index eb19d57ab..3f55f6731 100644 --- a/tests/ui/compare-method/region-extra-2.stderr +++ b/tests/ui/compare-method/region-extra-2.stderr @@ -12,6 +12,6 @@ help: copy the `where` clause predicates from the trait LL | fn renew<'b: 'a>(self) -> &'b mut [T] where 'b: 'a { | ~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. diff --git a/tests/ui/compare-method/region-extra.stderr b/tests/ui/compare-method/region-extra.stderr index 1a471e18d..065b3c152 100644 --- a/tests/ui/compare-method/region-extra.stderr +++ b/tests/ui/compare-method/region-extra.stderr @@ -13,6 +13,6 @@ LL - fn foo() where 'a: 'b { } LL + fn foo() { } | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. diff --git a/tests/ui/compare-method/region-unrelated.stderr b/tests/ui/compare-method/region-unrelated.stderr index f7ae6f944..75a4d51ce 100644 --- a/tests/ui/compare-method/region-unrelated.stderr +++ b/tests/ui/compare-method/region-unrelated.stderr @@ -7,6 +7,6 @@ LL | fn foo() where T: 'a; LL | fn foo() where V: 'a { } | ^^ impl has extra requirement `V: 'a` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. diff --git a/tests/ui/compare-method/reordered-type-param.stderr b/tests/ui/compare-method/reordered-type-param.stderr index 1552d542d..8a439acee 100644 --- a/tests/ui/compare-method/reordered-type-param.stderr +++ b/tests/ui/compare-method/reordered-type-param.stderr @@ -19,6 +19,6 @@ LL | fn b<C:Clone,D>(&self, x: C) -> C; = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0053`. diff --git a/tests/ui/compare-method/trait-bound-on-type-parameter.stderr b/tests/ui/compare-method/trait-bound-on-type-parameter.stderr index ce6885c15..0899d5406 100644 --- a/tests/ui/compare-method/trait-bound-on-type-parameter.stderr +++ b/tests/ui/compare-method/trait-bound-on-type-parameter.stderr @@ -7,6 +7,6 @@ LL | fn b<C,D>(&self, x: C) -> C; LL | fn b<F: Sync, G>(&self, _x: F) -> F { panic!() } | ^^^^ impl has extra requirement `F: Sync` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. diff --git a/tests/ui/compare-method/traits-misc-mismatch-2.stderr b/tests/ui/compare-method/traits-misc-mismatch-2.stderr index 36bb764d4..b8d3fd02a 100644 --- a/tests/ui/compare-method/traits-misc-mismatch-2.stderr +++ b/tests/ui/compare-method/traits-misc-mismatch-2.stderr @@ -7,6 +7,6 @@ LL | fn zip<B, U: Iterator<U>>(self, other: U) -> ZipIterator<Self, U>; LL | fn zip<B, U: Iterator<B>>(self, other: U) -> ZipIterator<T, U> { | ^^^^^^^^^^^ impl has extra requirement `U: Iterator<B>` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0276`. |