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/linkage-attr | |
| 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 '')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/linkage-attr/incompatible-flavor.stderr b/tests/ui/linkage-attr/incompatible-flavor.stderr index aabdd14b6..a0f6bff66 100644 --- a/tests/ui/linkage-attr/incompatible-flavor.stderr +++ b/tests/ui/linkage-attr/incompatible-flavor.stderr @@ -2,5 +2,5 @@ error: linker flavor `msvc` is incompatible with the current target | = note: compatible flavors are: gnu, gnu-lld, gnu-cc, gnu-lld-cc, gcc, ld, ld.lld -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/linkage-attr/issue-109144.stderr b/tests/ui/linkage-attr/issue-109144.stderr index 33187cfdb..0748d9418 100644 --- a/tests/ui/linkage-attr/issue-109144.stderr +++ b/tests/ui/linkage-attr/issue-109144.stderr @@ -4,6 +4,6 @@ error[E0459]: `#[link]` attribute requires a `name = "string"` argument LL | #[link(kind = "static", modifiers = "+whole-archive,+bundle")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0459`. diff --git a/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr index 06a070822..2448c160c 100644 --- a/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr +++ b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr @@ -4,5 +4,5 @@ error: symbol `collision` is already defined LL | pub static collision: *const i32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr index e0be1ac21..fcaaa39b6 100644 --- a/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr +++ b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr @@ -4,5 +4,5 @@ error: symbol `collision` is already defined LL | pub static collision: *const i32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/linkage-attr/linkage2.stderr b/tests/ui/linkage-attr/linkage2.stderr index 7265f711f..49290d5a1 100644 --- a/tests/ui/linkage-attr/linkage2.stderr +++ b/tests/ui/linkage-attr/linkage2.stderr @@ -4,6 +4,6 @@ error[E0791]: invalid type for variable with `#[linkage]` attribute LL | static foo: i32; | ^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0791`. diff --git a/tests/ui/linkage-attr/linkage3.stderr b/tests/ui/linkage-attr/linkage3.stderr index dbb5880ab..5f7b7ef22 100644 --- a/tests/ui/linkage-attr/linkage3.stderr +++ b/tests/ui/linkage-attr/linkage3.stderr @@ -4,5 +4,5 @@ error: invalid linkage specified LL | static foo: *const i32; | ^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/linkage-attr/linkage4.stderr b/tests/ui/linkage-attr/linkage4.stderr index 30d4d2b7b..f76655b3c 100644 --- a/tests/ui/linkage-attr/linkage4.stderr +++ b/tests/ui/linkage-attr/linkage4.stderr @@ -7,6 +7,6 @@ LL | #[linkage = "external"] = note: see issue #29603 <https://github.com/rust-lang/rust/issues/29603> for more information = help: add `#![feature(linkage)]` to the crate attributes to enable -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0658`. |