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/const_prop | |
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 '')
-rw-r--r-- | tests/ui/const_prop/apfloat-f64-roundtrip.rs | 1 | ||||
-rw-r--r-- | tests/ui/const_prop/const-prop-ice.stderr | 2 | ||||
-rw-r--r-- | tests/ui/const_prop/const-prop-ice2.stderr | 2 | ||||
-rw-r--r-- | tests/ui/const_prop/const-prop-read-static-in-const.stderr | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/tests/ui/const_prop/apfloat-f64-roundtrip.rs b/tests/ui/const_prop/apfloat-f64-roundtrip.rs index 9fb2ac96b..5f3ec931c 100644 --- a/tests/ui/const_prop/apfloat-f64-roundtrip.rs +++ b/tests/ui/const_prop/apfloat-f64-roundtrip.rs @@ -1,6 +1,5 @@ // run-pass // compile-flags: -O -Zmir-opt-level=3 -Cno-prepopulate-passes -// min-llvm-version: 16.0 (requires APFloat fixes in LLVM) // Regression test for a broken MIR optimization (issue #113407). pub fn main() { diff --git a/tests/ui/const_prop/const-prop-ice.stderr b/tests/ui/const_prop/const-prop-ice.stderr index 3bcf2b2de..8a0f831ba 100644 --- a/tests/ui/const_prop/const-prop-ice.stderr +++ b/tests/ui/const_prop/const-prop-ice.stderr @@ -6,5 +6,5 @@ LL | [0; 3][3u64 as usize]; | = note: `#[deny(unconditional_panic)]` on by default -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/const_prop/const-prop-ice2.stderr b/tests/ui/const_prop/const-prop-ice2.stderr index 2b65ffc2d..593b0b94c 100644 --- a/tests/ui/const_prop/const-prop-ice2.stderr +++ b/tests/ui/const_prop/const-prop-ice2.stderr @@ -6,5 +6,5 @@ LL | println!("{}", xs[Enum::One as usize]); | = note: `#[deny(unconditional_panic)]` on by default -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/const_prop/const-prop-read-static-in-const.stderr b/tests/ui/const_prop/const-prop-read-static-in-const.stderr index 793da6285..9af1f7e3a 100644 --- a/tests/ui/const_prop/const-prop-read-static-in-const.stderr +++ b/tests/ui/const_prop/const-prop-read-static-in-const.stderr @@ -12,6 +12,6 @@ help: skipping check that does not even have a feature gate LL | const TEST: u8 = MY_STATIC; | ^^^^^^^^^ -error: aborting due to previous error; 1 warning emitted +error: aborting due to 1 previous error; 1 warning emitted For more information about this error, try `rustc --explain E0080`. |