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/sanitize/cfg-kasan.rs | 2 -- tests/ui/sanitize/crt-static.stderr | 2 +- tests/ui/sanitize/incompatible.stderr | 2 +- .../ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr | 2 +- tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr | 2 +- tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr | 2 +- tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr | 2 +- tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr | 2 +- .../sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr | 2 +- tests/ui/sanitize/split-lto-unit-requires-lto.stderr | 2 +- tests/ui/sanitize/unsupported-target.stderr | 2 +- 11 files changed, 10 insertions(+), 12 deletions(-) (limited to 'tests/ui/sanitize') diff --git a/tests/ui/sanitize/cfg-kasan.rs b/tests/ui/sanitize/cfg-kasan.rs index d721011f3..fb9a6f549 100644 --- a/tests/ui/sanitize/cfg-kasan.rs +++ b/tests/ui/sanitize/cfg-kasan.rs @@ -8,10 +8,8 @@ //[aarch64] needs-llvm-components: aarch64 //[riscv64imac] compile-flags: --target riscv64imac-unknown-none-elf //[riscv64imac] needs-llvm-components: riscv -//[riscv64imac] min-llvm-version: 16 //[riscv64gc] compile-flags: --target riscv64gc-unknown-none-elf //[riscv64gc] needs-llvm-components: riscv -//[riscv64gc] min-llvm-version: 16 //[x86_64] compile-flags: --target x86_64-unknown-none //[x86_64] needs-llvm-components: x86 diff --git a/tests/ui/sanitize/crt-static.stderr b/tests/ui/sanitize/crt-static.stderr index 9f74235fe..98b0ed82e 100644 --- a/tests/ui/sanitize/crt-static.stderr +++ b/tests/ui/sanitize/crt-static.stderr @@ -1,4 +1,4 @@ error: sanitizer is incompatible with statically linked libc, disable it using `-C target-feature=-crt-static` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/incompatible.stderr b/tests/ui/sanitize/incompatible.stderr index f86db41ba..4dff813ee 100644 --- a/tests/ui/sanitize/incompatible.stderr +++ b/tests/ui/sanitize/incompatible.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer=address` is incompatible with `-Zsanitizer=memory` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr b/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr index 3ee95634b..de67d6a6b 100644 --- a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer-cfi-canonical-jump-tables` requires `-Zsanitizer=cfi` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr b/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr index 6eb09a53b..621708de2 100644 --- a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer-cfi-generalize-pointers` requires `-Zsanitizer=cfi` or `-Zsanitizer=kcfi` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr b/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr index e23bafb18..b9e9722da 100644 --- a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr @@ -4,5 +4,5 @@ error: malformed `cfi_encoding` attribute input LL | #[cfi_encoding] | ^^^^^^^^^^^^^^^ help: must be of the form: `#[cfi_encoding = "encoding"]` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr b/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr index e31642054..748fb60da 100644 --- a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer-cfi-normalize-integers` requires `-Zsanitizer=cfi` or `-Zsanitizer=kcfi` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr b/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr index 8cd9c5444..efc0c4313 100644 --- a/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer=cfi` requires `-Clto` or `-Clinker-plugin-lto` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr b/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr index 136f49360..8d6dc1d8f 100644 --- a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr +++ b/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr @@ -1,4 +1,4 @@ error: `-Zsanitizer=cfi` with `-Clto` requires `-Ccodegen-units=1` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/split-lto-unit-requires-lto.stderr b/tests/ui/sanitize/split-lto-unit-requires-lto.stderr index ab8f4f4f3..0da06b7f8 100644 --- a/tests/ui/sanitize/split-lto-unit-requires-lto.stderr +++ b/tests/ui/sanitize/split-lto-unit-requires-lto.stderr @@ -1,4 +1,4 @@ error: `-Zsplit-lto-unit` requires `-Clto`, `-Clto=thin`, or `-Clinker-plugin-lto` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/sanitize/unsupported-target.stderr b/tests/ui/sanitize/unsupported-target.stderr index 9bb840502..bebbf3884 100644 --- a/tests/ui/sanitize/unsupported-target.stderr +++ b/tests/ui/sanitize/unsupported-target.stderr @@ -1,4 +1,4 @@ error: leak sanitizer is not supported for this target -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3