diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
| commit | 9918693037dce8aa4bb6f08741b6812923486c18 (patch) | |
| tree | 21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /tests/ui/variance | |
| parent | Releasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff) | |
| download | rustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ui/variance')
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/ui/variance/variance-associated-consts.stderr b/tests/ui/variance/variance-associated-consts.stderr index 4df2d8da3..e25f0879a 100644 --- a/tests/ui/variance/variance-associated-consts.stderr +++ b/tests/ui/variance/variance-associated-consts.stderr @@ -4,5 +4,5 @@ error: [o] LL | struct Foo<T: Trait> { | ^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-associated-types2.stderr b/tests/ui/variance/variance-associated-types2.stderr index 35871c123..158b09b06 100644 --- a/tests/ui/variance/variance-associated-types2.stderr +++ b/tests/ui/variance/variance-associated-types2.stderr @@ -6,5 +6,5 @@ LL | fn take<'a>(_: &'a u32) { LL | let _: Box<dyn Foo<Bar = &'a u32>> = make(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'a` must outlive `'static` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-cell-is-invariant.stderr b/tests/ui/variance/variance-cell-is-invariant.stderr index ab5435d16..18e2de9f5 100644 --- a/tests/ui/variance/variance-cell-is-invariant.stderr +++ b/tests/ui/variance/variance-cell-is-invariant.stderr @@ -14,5 +14,5 @@ LL | let _: Foo<'long> = c; = note: the struct `Foo<'a>` is invariant over the parameter `'a` = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-object-types.stderr b/tests/ui/variance/variance-object-types.stderr index 55a760425..963f3454e 100644 --- a/tests/ui/variance/variance-object-types.stderr +++ b/tests/ui/variance/variance-object-types.stderr @@ -4,5 +4,5 @@ error: [o] LL | struct Foo<'a> { | ^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-trait-matching.stderr b/tests/ui/variance/variance-trait-matching.stderr index 3308cc6d2..9c72fe239 100644 --- a/tests/ui/variance/variance-trait-matching.stderr +++ b/tests/ui/variance/variance-trait-matching.stderr @@ -7,6 +7,6 @@ LL | fn get<'a, G>(get: &G) -> i32 LL | pick(get, &22) | ^^^^^^^^^^^^^^ lifetime `'a` required -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0621`. diff --git a/tests/ui/variance/variance-trait-object-bound.stderr b/tests/ui/variance/variance-trait-object-bound.stderr index bfcc8d4a1..f0471a346 100644 --- a/tests/ui/variance/variance-trait-object-bound.stderr +++ b/tests/ui/variance/variance-trait-object-bound.stderr @@ -4,5 +4,5 @@ error: [+] LL | struct TOption<'a> { | ^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-use-contravariant-struct-1.stderr b/tests/ui/variance/variance-use-contravariant-struct-1.stderr index 50de7c90f..5000787b8 100644 --- a/tests/ui/variance/variance-use-contravariant-struct-1.stderr +++ b/tests/ui/variance/variance-use-contravariant-struct-1.stderr @@ -11,5 +11,5 @@ LL | v | = help: consider adding the following bound: `'min: 'max` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/variance/variance-use-covariant-struct-1.stderr b/tests/ui/variance/variance-use-covariant-struct-1.stderr index bab858c5a..bd8458cd8 100644 --- a/tests/ui/variance/variance-use-covariant-struct-1.stderr +++ b/tests/ui/variance/variance-use-covariant-struct-1.stderr @@ -11,5 +11,5 @@ LL | v | = help: consider adding the following bound: `'min: 'max` -error: aborting due to previous error +error: aborting due to 1 previous error |