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/target-feature/gate.stderr | 2 +- tests/ui/target-feature/tied-features-cli.one.stderr | 2 +- tests/ui/target-feature/tied-features-cli.three.stderr | 2 +- tests/ui/target-feature/tied-features-cli.two.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ui/target-feature') diff --git a/tests/ui/target-feature/gate.stderr b/tests/ui/target-feature/gate.stderr index 0ec7427c3..b3bd12600 100644 --- a/tests/ui/target-feature/gate.stderr +++ b/tests/ui/target-feature/gate.stderr @@ -7,6 +7,6 @@ LL | #[target_feature(enable = "avx512bw")] = note: see issue #44839 for more information = help: add `#![feature(avx512_target_feature)]` 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`. diff --git a/tests/ui/target-feature/tied-features-cli.one.stderr b/tests/ui/target-feature/tied-features-cli.one.stderr index b4b50d981..bf211fbee 100644 --- a/tests/ui/target-feature/tied-features-cli.one.stderr +++ b/tests/ui/target-feature/tied-features-cli.one.stderr @@ -1,4 +1,4 @@ error: the target features paca, pacg must all be either enabled or disabled together -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/target-feature/tied-features-cli.three.stderr b/tests/ui/target-feature/tied-features-cli.three.stderr index b4b50d981..bf211fbee 100644 --- a/tests/ui/target-feature/tied-features-cli.three.stderr +++ b/tests/ui/target-feature/tied-features-cli.three.stderr @@ -1,4 +1,4 @@ error: the target features paca, pacg must all be either enabled or disabled together -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/target-feature/tied-features-cli.two.stderr b/tests/ui/target-feature/tied-features-cli.two.stderr index b4b50d981..bf211fbee 100644 --- a/tests/ui/target-feature/tied-features-cli.two.stderr +++ b/tests/ui/target-feature/tied-features-cli.two.stderr @@ -1,4 +1,4 @@ error: the target features paca, pacg must all be either enabled or disabled together -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3