From 6827ac2f37908f328305bae91d2e5387975da64e Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 21 Jun 2022 11:38:02 -0700 Subject: [PATCH 1/3] Format tests with rustfmt (225-275 of 300) --- tests/fail/box-cell-alias.rs | 4 +++- .../dangling_pointers/maybe_null_pointer_write_zst.rs | 4 +++- tests/fail/intrinsics/copy_null.rs | 4 +++- tests/fail/intrinsics/copy_unaligned.rs | 4 +++- tests/fail/intrinsics/exact_div1.rs | 4 +++- tests/fail/intrinsics/exact_div2.rs | 4 +++- tests/fail/intrinsics/exact_div3.rs | 4 +++- tests/fail/intrinsics/exact_div4.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_inf1.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_infneg1.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_nan.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_nanneg.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_neg.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_too_big1.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_too_big2.rs | 4 +++- tests/fail/intrinsics/float_to_int_32_too_small1.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_inf1.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_infneg1.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_infneg2.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_nan.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_neg.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big1.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big2.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big3.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big4.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big5.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big6.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_big7.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_small1.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_small2.rs | 4 +++- tests/fail/intrinsics/float_to_int_64_too_small3.rs | 4 +++- tests/fail/intrinsics/unchecked_add1.rs | 4 +++- tests/fail/intrinsics/unchecked_add2.rs | 4 +++- tests/fail/intrinsics/unchecked_div1.rs | 4 +++- tests/fail/intrinsics/unchecked_mul1.rs | 4 +++- tests/fail/intrinsics/unchecked_mul2.rs | 4 +++- tests/fail/intrinsics/unchecked_sub1.rs | 4 +++- tests/fail/intrinsics/unchecked_sub2.rs | 4 +++- tests/fail/panic/unwind_panic_abort.rs | 4 +++- tests/fail/stacked_borrows/illegal_write1.rs | 6 ++++-- tests/fail/stacked_borrows/illegal_write2.rs | 4 +++- tests/fail/stacked_borrows/illegal_write3.rs | 4 +++- tests/fail/stacked_borrows/illegal_write6.rs | 4 +++- tests/fail/stacked_borrows/raw_tracking.rs | 8 ++++++-- tests/fail/stacked_borrows/shr_frozen_violation1.rs | 10 ++++++---- tests/fail/stacked_borrows/transmute-is-no-escape.rs | 4 +++- tests/fail/stacked_borrows/unescaped_local.rs | 4 +++- .../unaligned_pointers/intptrcast_alignment_check.rs | 6 ++++-- tests/fail/validity/transmute_through_ptr.rs | 8 ++++++-- tests/fail/zst2.rs | 4 +++- tests/fail/zst3.rs | 8 ++++++-- 51 files changed, 167 insertions(+), 59 deletions(-) diff --git a/tests/fail/box-cell-alias.rs b/tests/fail/box-cell-alias.rs index 49cce275078..ffda1033d44 100644 --- a/tests/fail/box-cell-alias.rs +++ b/tests/fail/box-cell-alias.rs @@ -6,7 +6,9 @@ use std::cell::Cell; fn helper(val: Box>, ptr: *const Cell) -> u8 { val.set(10); - unsafe { (*ptr).set(20); } //~ ERROR does not exist in the borrow stack + unsafe { + (*ptr).set(20); + } //~ ERROR does not exist in the borrow stack val.get() } diff --git a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs index 7f50b9827d9..78384502337 100644 --- a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs +++ b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs @@ -7,5 +7,7 @@ fn main() { // Also not assigning directly as that's array initialization, not assignment. let zst_val = [1u8; 0]; let ptr = (&0u8 as *const u8).wrapping_sub(0x800) as *mut [u8; 0]; - unsafe { *ptr = zst_val; } //~ ERROR out-of-bounds + unsafe { + *ptr = zst_val; + } //~ ERROR out-of-bounds } diff --git a/tests/fail/intrinsics/copy_null.rs b/tests/fail/intrinsics/copy_null.rs index 8f32ad1a760..1e572fe4a85 100644 --- a/tests/fail/intrinsics/copy_null.rs +++ b/tests/fail/intrinsics/copy_null.rs @@ -9,5 +9,7 @@ fn main() { let mut data = [0u16; 4]; let ptr = &mut data[0] as *mut u16; // Even copying 0 elements from NULL should error. - unsafe { copy_nonoverlapping(std::ptr::null(), ptr, 0); } //~ ERROR: memory access failed: null pointer is not a valid pointer + unsafe { + copy_nonoverlapping(std::ptr::null(), ptr, 0); + } //~ ERROR: memory access failed: null pointer is not a valid pointer } diff --git a/tests/fail/intrinsics/copy_unaligned.rs b/tests/fail/intrinsics/copy_unaligned.rs index 84f4de93461..d7097bb91d3 100644 --- a/tests/fail/intrinsics/copy_unaligned.rs +++ b/tests/fail/intrinsics/copy_unaligned.rs @@ -9,5 +9,7 @@ fn main() { let mut data = [0u16; 8]; let ptr = (&mut data[0] as *mut u16 as *mut u8).wrapping_add(1) as *mut u16; // Even copying 0 elements to something unaligned should error - unsafe { copy_nonoverlapping(&data[5], ptr, 0); } //~ ERROR accessing memory with alignment 1, but alignment 2 is required + unsafe { + copy_nonoverlapping(&data[5], ptr, 0); + } //~ ERROR accessing memory with alignment 1, but alignment 2 is required } diff --git a/tests/fail/intrinsics/exact_div1.rs b/tests/fail/intrinsics/exact_div1.rs index 171bedeadc6..5d2185f1ee1 100644 --- a/tests/fail/intrinsics/exact_div1.rs +++ b/tests/fail/intrinsics/exact_div1.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // divison by 0 - unsafe { std::intrinsics::exact_div(2, 0); } //~ ERROR divisor of zero + unsafe { + std::intrinsics::exact_div(2, 0); + } //~ ERROR divisor of zero } diff --git a/tests/fail/intrinsics/exact_div2.rs b/tests/fail/intrinsics/exact_div2.rs index 1327046920d..e0301fbd73e 100644 --- a/tests/fail/intrinsics/exact_div2.rs +++ b/tests/fail/intrinsics/exact_div2.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // divison with a remainder - unsafe { std::intrinsics::exact_div(2u16, 3); } //~ ERROR 2_u16 cannot be divided by 3_u16 without remainder + unsafe { + std::intrinsics::exact_div(2u16, 3); + } //~ ERROR 2_u16 cannot be divided by 3_u16 without remainder } diff --git a/tests/fail/intrinsics/exact_div3.rs b/tests/fail/intrinsics/exact_div3.rs index 6a309442749..5f74b2dfa81 100644 --- a/tests/fail/intrinsics/exact_div3.rs +++ b/tests/fail/intrinsics/exact_div3.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // signed divison with a remainder - unsafe { std::intrinsics::exact_div(-19i8, 2); } //~ ERROR -19_i8 cannot be divided by 2_i8 without remainder + unsafe { + std::intrinsics::exact_div(-19i8, 2); + } //~ ERROR -19_i8 cannot be divided by 2_i8 without remainder } diff --git a/tests/fail/intrinsics/exact_div4.rs b/tests/fail/intrinsics/exact_div4.rs index 2831795de82..f70746d2a11 100644 --- a/tests/fail/intrinsics/exact_div4.rs +++ b/tests/fail/intrinsics/exact_div4.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // divison of MIN by -1 - unsafe { std::intrinsics::exact_div(i64::MIN, -1); } //~ ERROR overflow in signed remainder (dividing MIN by -1) + unsafe { + std::intrinsics::exact_div(i64::MIN, -1); + } //~ ERROR overflow in signed remainder (dividing MIN by -1) } diff --git a/tests/fail/intrinsics/float_to_int_32_inf1.rs b/tests/fail/intrinsics/float_to_int_32_inf1.rs index a56f4aefad3..32c2e09b53a 100644 --- a/tests/fail/intrinsics/float_to_int_32_inf1.rs +++ b/tests/fail/intrinsics/float_to_int_32_inf1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f32::INFINITY); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(f32::INFINITY); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_32_infneg1.rs b/tests/fail/intrinsics/float_to_int_32_infneg1.rs index d18f75fcca8..e1ba2224a08 100644 --- a/tests/fail/intrinsics/float_to_int_32_infneg1.rs +++ b/tests/fail/intrinsics/float_to_int_32_infneg1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f32::NEG_INFINITY); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(f32::NEG_INFINITY); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_32_nan.rs b/tests/fail/intrinsics/float_to_int_32_nan.rs index e1fe8c7cf2f..6c128d94a87 100644 --- a/tests/fail/intrinsics/float_to_int_32_nan.rs +++ b/tests/fail/intrinsics/float_to_int_32_nan.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f32::NAN); } //~ ERROR: cannot be represented in target type `u32` + unsafe { + float_to_int_unchecked::(f32::NAN); + } //~ ERROR: cannot be represented in target type `u32` } diff --git a/tests/fail/intrinsics/float_to_int_32_nanneg.rs b/tests/fail/intrinsics/float_to_int_32_nanneg.rs index 38899045c92..9bc628e9db9 100644 --- a/tests/fail/intrinsics/float_to_int_32_nanneg.rs +++ b/tests/fail/intrinsics/float_to_int_32_nanneg.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-f32::NAN); } //~ ERROR: cannot be represented in target type `u32` + unsafe { + float_to_int_unchecked::(-f32::NAN); + } //~ ERROR: cannot be represented in target type `u32` } diff --git a/tests/fail/intrinsics/float_to_int_32_neg.rs b/tests/fail/intrinsics/float_to_int_32_neg.rs index f15cf9a9cd6..188a9256db7 100644 --- a/tests/fail/intrinsics/float_to_int_32_neg.rs +++ b/tests/fail/intrinsics/float_to_int_32_neg.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-1.000000001f32); } //~ ERROR: cannot be represented in target type `u32` + unsafe { + float_to_int_unchecked::(-1.000000001f32); + } //~ ERROR: cannot be represented in target type `u32` } diff --git a/tests/fail/intrinsics/float_to_int_32_too_big1.rs b/tests/fail/intrinsics/float_to_int_32_too_big1.rs index ccbf917c8e8..787941e63e2 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big1.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_big1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(2147483648.0f32); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(2147483648.0f32); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_32_too_big2.rs b/tests/fail/intrinsics/float_to_int_32_too_big2.rs index 6598fd36e03..39b74cb0486 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big2.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_big2.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::((u32::MAX-127) as f32); } //~ ERROR: cannot be represented in target type `u32` + unsafe { + float_to_int_unchecked::((u32::MAX - 127) as f32); + } //~ ERROR: cannot be represented in target type `u32` } diff --git a/tests/fail/intrinsics/float_to_int_32_too_small1.rs b/tests/fail/intrinsics/float_to_int_32_too_small1.rs index 89f09e1e3f1..a96738214bd 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_small1.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_small1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-2147483904.0f32); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(-2147483904.0f32); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_64_inf1.rs b/tests/fail/intrinsics/float_to_int_64_inf1.rs index e1a7b818d85..259ec883f6c 100644 --- a/tests/fail/intrinsics/float_to_int_64_inf1.rs +++ b/tests/fail/intrinsics/float_to_int_64_inf1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::INFINITY); } //~ ERROR: cannot be represented in target type `u128` + unsafe { + float_to_int_unchecked::(f64::INFINITY); + } //~ ERROR: cannot be represented in target type `u128` } diff --git a/tests/fail/intrinsics/float_to_int_64_infneg1.rs b/tests/fail/intrinsics/float_to_int_64_infneg1.rs index a1d757b1511..3bc5ac710e9 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg1.rs +++ b/tests/fail/intrinsics/float_to_int_64_infneg1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::NEG_INFINITY); } //~ ERROR: cannot be represented in target type `u128` + unsafe { + float_to_int_unchecked::(f64::NEG_INFINITY); + } //~ ERROR: cannot be represented in target type `u128` } diff --git a/tests/fail/intrinsics/float_to_int_64_infneg2.rs b/tests/fail/intrinsics/float_to_int_64_infneg2.rs index e48d19f1a6a..81a79c4d211 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg2.rs +++ b/tests/fail/intrinsics/float_to_int_64_infneg2.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::NEG_INFINITY); } //~ ERROR: cannot be represented in target type `i128` + unsafe { + float_to_int_unchecked::(f64::NEG_INFINITY); + } //~ ERROR: cannot be represented in target type `i128` } diff --git a/tests/fail/intrinsics/float_to_int_64_nan.rs b/tests/fail/intrinsics/float_to_int_64_nan.rs index 03f378f5bcb..47580ad5b2a 100644 --- a/tests/fail/intrinsics/float_to_int_64_nan.rs +++ b/tests/fail/intrinsics/float_to_int_64_nan.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::NAN); } //~ ERROR: cannot be represented in target type `u32` + unsafe { + float_to_int_unchecked::(f64::NAN); + } //~ ERROR: cannot be represented in target type `u32` } diff --git a/tests/fail/intrinsics/float_to_int_64_neg.rs b/tests/fail/intrinsics/float_to_int_64_neg.rs index d0b5a3e21cf..0e97c2f26bb 100644 --- a/tests/fail/intrinsics/float_to_int_64_neg.rs +++ b/tests/fail/intrinsics/float_to_int_64_neg.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-1.0000000000001f64); } //~ ERROR: cannot be represented in target type `u128` + unsafe { + float_to_int_unchecked::(-1.0000000000001f64); + } //~ ERROR: cannot be represented in target type `u128` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big1.rs b/tests/fail/intrinsics/float_to_int_64_too_big1.rs index f928f161872..fb75a793ded 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big1.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(2147483648.0f64); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(2147483648.0f64); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big2.rs b/tests/fail/intrinsics/float_to_int_64_too_big2.rs index feb24c362dd..0c039ff8493 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big2.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big2.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(9223372036854775808.0f64); } //~ ERROR: cannot be represented in target type `i64` + unsafe { + float_to_int_unchecked::(9223372036854775808.0f64); + } //~ ERROR: cannot be represented in target type `i64` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big3.rs b/tests/fail/intrinsics/float_to_int_64_too_big3.rs index cd491bfed7e..b9d2775f032 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big3.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big3.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(18446744073709551616.0f64); } //~ ERROR: cannot be represented in target type `u64` + unsafe { + float_to_int_unchecked::(18446744073709551616.0f64); + } //~ ERROR: cannot be represented in target type `u64` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big4.rs b/tests/fail/intrinsics/float_to_int_64_too_big4.rs index e9623dba947..4a2dc7822f7 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big4.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big4.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(u128::MAX as f64); } //~ ERROR: cannot be represented in target type `u128` + unsafe { + float_to_int_unchecked::(u128::MAX as f64); + } //~ ERROR: cannot be represented in target type `u128` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big5.rs b/tests/fail/intrinsics/float_to_int_64_too_big5.rs index 9c31c690b4e..bf1f797a000 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big5.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big5.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); } //~ ERROR: cannot be represented in target type `i128` + unsafe { + float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); + } //~ ERROR: cannot be represented in target type `i128` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big6.rs b/tests/fail/intrinsics/float_to_int_64_too_big6.rs index f008131a6e5..2b6d6359c9a 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big6.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big6.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::MAX); } //~ ERROR: cannot be represented in target type `u128` + unsafe { + float_to_int_unchecked::(f64::MAX); + } //~ ERROR: cannot be represented in target type `u128` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big7.rs b/tests/fail/intrinsics/float_to_int_64_too_big7.rs index 69922e60a6b..e9b1333232c 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big7.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big7.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(f64::MIN); } //~ ERROR: cannot be represented in target type `i128` + unsafe { + float_to_int_unchecked::(f64::MIN); + } //~ ERROR: cannot be represented in target type `i128` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small1.rs b/tests/fail/intrinsics/float_to_int_64_too_small1.rs index 08f2f9e3fd2..652edf1931b 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small1.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small1.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-2147483649.0f64); } //~ ERROR: cannot be represented in target type `i32` + unsafe { + float_to_int_unchecked::(-2147483649.0f64); + } //~ ERROR: cannot be represented in target type `i32` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small2.rs b/tests/fail/intrinsics/float_to_int_64_too_small2.rs index f7b205de534..d3d5559291b 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small2.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small2.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-9223372036854777856.0f64); } //~ ERROR: cannot be represented in target type `i64` + unsafe { + float_to_int_unchecked::(-9223372036854777856.0f64); + } //~ ERROR: cannot be represented in target type `i64` } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small3.rs b/tests/fail/intrinsics/float_to_int_64_too_small3.rs index 779441f7448..0e22951a45c 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small3.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small3.rs @@ -6,5 +6,7 @@ extern "rust-intrinsic" { } fn main() { - unsafe { float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); } //~ ERROR: cannot be represented in target type `i128` + unsafe { + float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); + } //~ ERROR: cannot be represented in target type `i128` } diff --git a/tests/fail/intrinsics/unchecked_add1.rs b/tests/fail/intrinsics/unchecked_add1.rs index f48b91422c6..90d0a3d0123 100644 --- a/tests/fail/intrinsics/unchecked_add1.rs +++ b/tests/fail/intrinsics/unchecked_add1.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MAX overflow - unsafe { std::intrinsics::unchecked_add(40000u16, 30000); } //~ ERROR overflow executing `unchecked_add` + unsafe { + std::intrinsics::unchecked_add(40000u16, 30000); + } //~ ERROR overflow executing `unchecked_add` } diff --git a/tests/fail/intrinsics/unchecked_add2.rs b/tests/fail/intrinsics/unchecked_add2.rs index 150986541c3..68e9fb4563e 100644 --- a/tests/fail/intrinsics/unchecked_add2.rs +++ b/tests/fail/intrinsics/unchecked_add2.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MIN overflow - unsafe { std::intrinsics::unchecked_add(-30000i16, -8000); } //~ ERROR overflow executing `unchecked_add` + unsafe { + std::intrinsics::unchecked_add(-30000i16, -8000); + } //~ ERROR overflow executing `unchecked_add` } diff --git a/tests/fail/intrinsics/unchecked_div1.rs b/tests/fail/intrinsics/unchecked_div1.rs index 08b654da3ed..23fc1514f1a 100644 --- a/tests/fail/intrinsics/unchecked_div1.rs +++ b/tests/fail/intrinsics/unchecked_div1.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MIN/-1 cannot be represented - unsafe { std::intrinsics::unchecked_div(i16::MIN, -1); } //~ ERROR overflow in signed division (dividing MIN by -1) + unsafe { + std::intrinsics::unchecked_div(i16::MIN, -1); + } //~ ERROR overflow in signed division (dividing MIN by -1) } diff --git a/tests/fail/intrinsics/unchecked_mul1.rs b/tests/fail/intrinsics/unchecked_mul1.rs index 050e3ff2437..f26d4d3d213 100644 --- a/tests/fail/intrinsics/unchecked_mul1.rs +++ b/tests/fail/intrinsics/unchecked_mul1.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MAX overflow - unsafe { std::intrinsics::unchecked_mul(300u16, 250u16); } //~ ERROR overflow executing `unchecked_mul` + unsafe { + std::intrinsics::unchecked_mul(300u16, 250u16); + } //~ ERROR overflow executing `unchecked_mul` } diff --git a/tests/fail/intrinsics/unchecked_mul2.rs b/tests/fail/intrinsics/unchecked_mul2.rs index 4fb77783b4c..f3e20e8c295 100644 --- a/tests/fail/intrinsics/unchecked_mul2.rs +++ b/tests/fail/intrinsics/unchecked_mul2.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MIN overflow - unsafe { std::intrinsics::unchecked_mul(1_000_000_000i32, -4); } //~ ERROR overflow executing `unchecked_mul` + unsafe { + std::intrinsics::unchecked_mul(1_000_000_000i32, -4); + } //~ ERROR overflow executing `unchecked_mul` } diff --git a/tests/fail/intrinsics/unchecked_sub1.rs b/tests/fail/intrinsics/unchecked_sub1.rs index 69b32dd319b..3ea5e618074 100644 --- a/tests/fail/intrinsics/unchecked_sub1.rs +++ b/tests/fail/intrinsics/unchecked_sub1.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MIN overflow - unsafe { std::intrinsics::unchecked_sub(14u32, 22); } //~ ERROR overflow executing `unchecked_sub` + unsafe { + std::intrinsics::unchecked_sub(14u32, 22); + } //~ ERROR overflow executing `unchecked_sub` } diff --git a/tests/fail/intrinsics/unchecked_sub2.rs b/tests/fail/intrinsics/unchecked_sub2.rs index 5609ea7a3ed..0e9892e58a5 100644 --- a/tests/fail/intrinsics/unchecked_sub2.rs +++ b/tests/fail/intrinsics/unchecked_sub2.rs @@ -1,5 +1,7 @@ #![feature(core_intrinsics)] fn main() { // MAX overflow - unsafe { std::intrinsics::unchecked_sub(30000i16, -7000); } //~ ERROR overflow executing `unchecked_sub` + unsafe { + std::intrinsics::unchecked_sub(30000i16, -7000); + } //~ ERROR overflow executing `unchecked_sub` } diff --git a/tests/fail/panic/unwind_panic_abort.rs b/tests/fail/panic/unwind_panic_abort.rs index a333a4b0ded..7cb0c7b0279 100644 --- a/tests/fail/panic/unwind_panic_abort.rs +++ b/tests/fail/panic/unwind_panic_abort.rs @@ -7,5 +7,7 @@ extern "Rust" { } fn main() { - unsafe { miri_start_panic(&mut 0); } //~ ERROR unwinding past a stack frame that does not allow unwinding + unsafe { + miri_start_panic(&mut 0); + } //~ ERROR unwinding past a stack frame that does not allow unwinding } diff --git a/tests/fail/stacked_borrows/illegal_write1.rs b/tests/fail/stacked_borrows/illegal_write1.rs index dd262a341ed..5bdd4ef1f05 100644 --- a/tests/fail/stacked_borrows/illegal_write1.rs +++ b/tests/fail/stacked_borrows/illegal_write1.rs @@ -2,8 +2,10 @@ fn main() { let target = Box::new(42); // has an implicit raw let xref = &*target; { - let x : *mut u32 = xref as *const _ as *mut _; - unsafe { *x = 42; } // invalidates shared ref, activates raw + let x: *mut u32 = xref as *const _ as *mut _; + unsafe { + *x = 42; + } // invalidates shared ref, activates raw } let _x = *xref; //~ ERROR borrow stack } diff --git a/tests/fail/stacked_borrows/illegal_write2.rs b/tests/fail/stacked_borrows/illegal_write2.rs index 62ea05e1811..25a9cc4012b 100644 --- a/tests/fail/stacked_borrows/illegal_write2.rs +++ b/tests/fail/stacked_borrows/illegal_write2.rs @@ -3,6 +3,8 @@ fn main() { let target2 = target as *mut _; drop(&mut *target); // reborrow // Now make sure our ref is still the only one. - unsafe { *target2 = 13; } //~ ERROR borrow stack + unsafe { + *target2 = 13; + } //~ ERROR borrow stack let _val = *target; } diff --git a/tests/fail/stacked_borrows/illegal_write3.rs b/tests/fail/stacked_borrows/illegal_write3.rs index 7851eeb0269..4bbd1e56a74 100644 --- a/tests/fail/stacked_borrows/illegal_write3.rs +++ b/tests/fail/stacked_borrows/illegal_write3.rs @@ -3,6 +3,8 @@ fn main() { // Make sure raw ptr with raw tag cannot mutate frozen location without breaking the shared ref. let r#ref = ⌖ // freeze let ptr = r#ref as *const _ as *mut _; // raw ptr, with raw tag - unsafe { *ptr = 42; } //~ ERROR only grants SharedReadOnly permission + unsafe { + *ptr = 42; + } //~ ERROR only grants SharedReadOnly permission let _val = *r#ref; } diff --git a/tests/fail/stacked_borrows/illegal_write6.rs b/tests/fail/stacked_borrows/illegal_write6.rs index 6985e7f0ead..49ffb9a8604 100644 --- a/tests/fail/stacked_borrows/illegal_write6.rs +++ b/tests/fail/stacked_borrows/illegal_write6.rs @@ -7,6 +7,8 @@ fn main() { fn foo(a: &mut u32, y: *mut u32) -> u32 { *a = 1; let _b = &*a; - unsafe { *y = 2; } //~ ERROR: not granting access to tag + unsafe { + *y = 2; + } //~ ERROR: not granting access to tag return *a; } diff --git a/tests/fail/stacked_borrows/raw_tracking.rs b/tests/fail/stacked_borrows/raw_tracking.rs index a8e1d806cbb..22898483bf1 100644 --- a/tests/fail/stacked_borrows/raw_tracking.rs +++ b/tests/fail/stacked_borrows/raw_tracking.rs @@ -7,6 +7,10 @@ fn main() { let raw2 = &mut l as *mut _; // invalidates raw1 // Without raw pointer tracking, Stacked Borrows cannot distinguish raw1 and raw2, and thus // fails to realize that raw1 should not be used any more. - unsafe { *raw1 = 13; } //~ ERROR does not exist in the borrow stack - unsafe { *raw2 = 13; } + unsafe { + *raw1 = 13; + } //~ ERROR does not exist in the borrow stack + unsafe { + *raw2 = 13; + } } diff --git a/tests/fail/stacked_borrows/shr_frozen_violation1.rs b/tests/fail/stacked_borrows/shr_frozen_violation1.rs index 1ea96086d3e..803e8c6eb10 100644 --- a/tests/fail/stacked_borrows/shr_frozen_violation1.rs +++ b/tests/fail/stacked_borrows/shr_frozen_violation1.rs @@ -1,7 +1,7 @@ fn foo(x: &mut i32) -> i32 { - *x = 5; - unknown_code(&*x); - *x // must return 5 + *x = 5; + unknown_code(&*x); + *x // must return 5 } fn main() { @@ -9,5 +9,7 @@ fn main() { } fn unknown_code(x: &i32) { - unsafe { *(x as *const i32 as *mut i32) = 7; } //~ ERROR only grants SharedReadOnly permission + unsafe { + *(x as *const i32 as *mut i32) = 7; + } //~ ERROR only grants SharedReadOnly permission } diff --git a/tests/fail/stacked_borrows/transmute-is-no-escape.rs b/tests/fail/stacked_borrows/transmute-is-no-escape.rs index e9282c5ba8f..2a766d2c1b7 100644 --- a/tests/fail/stacked_borrows/transmute-is-no-escape.rs +++ b/tests/fail/stacked_borrows/transmute-is-no-escape.rs @@ -10,5 +10,7 @@ fn main() { let _raw: *mut i32 = unsafe { mem::transmute(&mut x[0]) }; // `raw` still carries a tag, so we get another pointer to the same location that does not carry a tag let raw = (&mut x[1] as *mut i32).wrapping_offset(-1); - unsafe { *raw = 13; } //~ ERROR borrow stack + unsafe { + *raw = 13; + } //~ ERROR borrow stack } diff --git a/tests/fail/stacked_borrows/unescaped_local.rs b/tests/fail/stacked_borrows/unescaped_local.rs index b49e6cce63b..c807f936d12 100644 --- a/tests/fail/stacked_borrows/unescaped_local.rs +++ b/tests/fail/stacked_borrows/unescaped_local.rs @@ -4,5 +4,7 @@ fn main() { let mut x = 42; let raw = &mut x as *mut i32 as usize as *mut i32; let _ptr = &mut x; - unsafe { *raw = 13; } //~ ERROR borrow stack + unsafe { + *raw = 13; + } //~ ERROR borrow stack } diff --git a/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs b/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs index 9872a493c02..ca892f83209 100644 --- a/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs +++ b/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs @@ -10,8 +10,10 @@ fn main() { let x = &mut [0u8; 3]; let base_addr = x as *mut _ as usize; // Manually make sure the pointer is properly aligned. - let base_addr_aligned = if base_addr % 2 == 0 { base_addr } else { base_addr+1 }; + let base_addr_aligned = if base_addr % 2 == 0 { base_addr } else { base_addr + 1 }; let u16_ptr = base_addr_aligned as *mut u16; - unsafe { *u16_ptr = 2; } //~ERROR memory with alignment 1, but alignment 2 is required + unsafe { + *u16_ptr = 2; + } //~ERROR memory with alignment 1, but alignment 2 is required println!("{:?}", x); } diff --git a/tests/fail/validity/transmute_through_ptr.rs b/tests/fail/validity/transmute_through_ptr.rs index b1984429d2d..23da1ba1257 100644 --- a/tests/fail/validity/transmute_through_ptr.rs +++ b/tests/fail/validity/transmute_through_ptr.rs @@ -1,10 +1,14 @@ #[repr(u32)] #[derive(Debug)] -enum Bool { True } +enum Bool { + True, +} fn evil(x: &mut Bool) { let x = x as *mut _ as *mut u32; - unsafe { *x = 44; } // out-of-bounds enum tag + unsafe { + *x = 44; + } // out-of-bounds enum tag } #[rustfmt::skip] // rustfmt bug: https://github.com/rust-lang/rustfmt/issues/5391 diff --git a/tests/fail/zst2.rs b/tests/fail/zst2.rs index a602cb731e4..cd9cf3618d2 100644 --- a/tests/fail/zst2.rs +++ b/tests/fail/zst2.rs @@ -11,5 +11,7 @@ fn main() { let mut x_box = Box::new(1u8); let x = &mut *x_box as *mut _ as *mut [u8; 0]; drop(x_box); - unsafe { *x = zst_val; } //~ ERROR dereferenced after this allocation got freed + unsafe { + *x = zst_val; + } //~ ERROR dereferenced after this allocation got freed } diff --git a/tests/fail/zst3.rs b/tests/fail/zst3.rs index 7ecb8c7dca9..defb5a626ba 100644 --- a/tests/fail/zst3.rs +++ b/tests/fail/zst3.rs @@ -11,8 +11,12 @@ fn main() { let mut x_box = Box::new(1u8); let x = (&mut *x_box as *mut u8).wrapping_offset(1); // This one is just "at the edge", but still okay - unsafe { *(x as *mut [u8; 0]) = zst_val; } + unsafe { + *(x as *mut [u8; 0]) = zst_val; + } // One byte further is OOB. let x = x.wrapping_offset(1); - unsafe { *(x as *mut [u8; 0]) = zst_val; } //~ ERROR out-of-bounds + unsafe { + *(x as *mut [u8; 0]) = zst_val; + } //~ ERROR out-of-bounds } From 7326da7ce3750087fe13effd595c73caf92f5cdf Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 21 Jun 2022 11:40:02 -0700 Subject: [PATCH 2/3] Manual adjustments --- tests/fail/box-cell-alias.rs | 4 ++-- tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs | 4 ++-- tests/fail/intrinsics/copy_null.rs | 4 ++-- tests/fail/intrinsics/copy_unaligned.rs | 4 ++-- tests/fail/intrinsics/exact_div1.rs | 4 ++-- tests/fail/intrinsics/exact_div2.rs | 4 ++-- tests/fail/intrinsics/exact_div3.rs | 4 ++-- tests/fail/intrinsics/exact_div4.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_inf1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_infneg1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_nan.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_nanneg.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_neg.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_too_big1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_too_big2.rs | 4 ++-- tests/fail/intrinsics/float_to_int_32_too_small1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_inf1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_infneg1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_infneg2.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_nan.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_neg.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big2.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big3.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big4.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big5.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big6.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_big7.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_small1.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_small2.rs | 4 ++-- tests/fail/intrinsics/float_to_int_64_too_small3.rs | 4 ++-- tests/fail/intrinsics/unchecked_add1.rs | 4 ++-- tests/fail/intrinsics/unchecked_add2.rs | 4 ++-- tests/fail/intrinsics/unchecked_div1.rs | 4 ++-- tests/fail/intrinsics/unchecked_mul1.rs | 4 ++-- tests/fail/intrinsics/unchecked_mul2.rs | 4 ++-- tests/fail/intrinsics/unchecked_sub1.rs | 4 ++-- tests/fail/intrinsics/unchecked_sub2.rs | 4 ++-- tests/fail/panic/unwind_panic_abort.rs | 4 ++-- tests/fail/stacked_borrows/illegal_write1.rs | 4 ++-- tests/fail/stacked_borrows/illegal_write2.rs | 4 ++-- tests/fail/stacked_borrows/illegal_write3.rs | 4 ++-- tests/fail/stacked_borrows/illegal_write6.rs | 4 ++-- tests/fail/stacked_borrows/raw_tracking.rs | 4 ++-- tests/fail/stacked_borrows/shr_frozen_violation1.rs | 4 ++-- tests/fail/stacked_borrows/transmute-is-no-escape.rs | 4 ++-- tests/fail/stacked_borrows/unescaped_local.rs | 4 ++-- tests/fail/unaligned_pointers/intptrcast_alignment_check.rs | 4 ++-- tests/fail/validity/transmute_through_ptr.rs | 4 ++-- tests/fail/zst2.rs | 4 ++-- tests/fail/zst3.rs | 4 ++-- 51 files changed, 102 insertions(+), 102 deletions(-) diff --git a/tests/fail/box-cell-alias.rs b/tests/fail/box-cell-alias.rs index ffda1033d44..c1fec28ae3b 100644 --- a/tests/fail/box-cell-alias.rs +++ b/tests/fail/box-cell-alias.rs @@ -7,8 +7,8 @@ use std::cell::Cell; fn helper(val: Box>, ptr: *const Cell) -> u8 { val.set(10); unsafe { - (*ptr).set(20); - } //~ ERROR does not exist in the borrow stack + (*ptr).set(20); //~ ERROR does not exist in the borrow stack + } val.get() } diff --git a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs index 78384502337..3115da436be 100644 --- a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs +++ b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.rs @@ -8,6 +8,6 @@ fn main() { let zst_val = [1u8; 0]; let ptr = (&0u8 as *const u8).wrapping_sub(0x800) as *mut [u8; 0]; unsafe { - *ptr = zst_val; - } //~ ERROR out-of-bounds + *ptr = zst_val; //~ ERROR out-of-bounds + } } diff --git a/tests/fail/intrinsics/copy_null.rs b/tests/fail/intrinsics/copy_null.rs index 1e572fe4a85..7ab41232498 100644 --- a/tests/fail/intrinsics/copy_null.rs +++ b/tests/fail/intrinsics/copy_null.rs @@ -10,6 +10,6 @@ fn main() { let ptr = &mut data[0] as *mut u16; // Even copying 0 elements from NULL should error. unsafe { - copy_nonoverlapping(std::ptr::null(), ptr, 0); - } //~ ERROR: memory access failed: null pointer is not a valid pointer + copy_nonoverlapping(std::ptr::null(), ptr, 0); //~ ERROR: memory access failed: null pointer is not a valid pointer + } } diff --git a/tests/fail/intrinsics/copy_unaligned.rs b/tests/fail/intrinsics/copy_unaligned.rs index d7097bb91d3..162f06bfacd 100644 --- a/tests/fail/intrinsics/copy_unaligned.rs +++ b/tests/fail/intrinsics/copy_unaligned.rs @@ -10,6 +10,6 @@ fn main() { let ptr = (&mut data[0] as *mut u16 as *mut u8).wrapping_add(1) as *mut u16; // Even copying 0 elements to something unaligned should error unsafe { - copy_nonoverlapping(&data[5], ptr, 0); - } //~ ERROR accessing memory with alignment 1, but alignment 2 is required + copy_nonoverlapping(&data[5], ptr, 0); //~ ERROR accessing memory with alignment 1, but alignment 2 is required + } } diff --git a/tests/fail/intrinsics/exact_div1.rs b/tests/fail/intrinsics/exact_div1.rs index 5d2185f1ee1..d8af789e99a 100644 --- a/tests/fail/intrinsics/exact_div1.rs +++ b/tests/fail/intrinsics/exact_div1.rs @@ -2,6 +2,6 @@ fn main() { // divison by 0 unsafe { - std::intrinsics::exact_div(2, 0); - } //~ ERROR divisor of zero + std::intrinsics::exact_div(2, 0); //~ ERROR divisor of zero + } } diff --git a/tests/fail/intrinsics/exact_div2.rs b/tests/fail/intrinsics/exact_div2.rs index e0301fbd73e..80f9131bab7 100644 --- a/tests/fail/intrinsics/exact_div2.rs +++ b/tests/fail/intrinsics/exact_div2.rs @@ -2,6 +2,6 @@ fn main() { // divison with a remainder unsafe { - std::intrinsics::exact_div(2u16, 3); - } //~ ERROR 2_u16 cannot be divided by 3_u16 without remainder + std::intrinsics::exact_div(2u16, 3); //~ ERROR 2_u16 cannot be divided by 3_u16 without remainder + } } diff --git a/tests/fail/intrinsics/exact_div3.rs b/tests/fail/intrinsics/exact_div3.rs index 5f74b2dfa81..976fca29f9b 100644 --- a/tests/fail/intrinsics/exact_div3.rs +++ b/tests/fail/intrinsics/exact_div3.rs @@ -2,6 +2,6 @@ fn main() { // signed divison with a remainder unsafe { - std::intrinsics::exact_div(-19i8, 2); - } //~ ERROR -19_i8 cannot be divided by 2_i8 without remainder + std::intrinsics::exact_div(-19i8, 2); //~ ERROR -19_i8 cannot be divided by 2_i8 without remainder + } } diff --git a/tests/fail/intrinsics/exact_div4.rs b/tests/fail/intrinsics/exact_div4.rs index f70746d2a11..5f4ca587e6d 100644 --- a/tests/fail/intrinsics/exact_div4.rs +++ b/tests/fail/intrinsics/exact_div4.rs @@ -2,6 +2,6 @@ fn main() { // divison of MIN by -1 unsafe { - std::intrinsics::exact_div(i64::MIN, -1); - } //~ ERROR overflow in signed remainder (dividing MIN by -1) + std::intrinsics::exact_div(i64::MIN, -1); //~ ERROR overflow in signed remainder (dividing MIN by -1) + } } diff --git a/tests/fail/intrinsics/float_to_int_32_inf1.rs b/tests/fail/intrinsics/float_to_int_32_inf1.rs index 32c2e09b53a..a57845426d5 100644 --- a/tests/fail/intrinsics/float_to_int_32_inf1.rs +++ b/tests/fail/intrinsics/float_to_int_32_inf1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f32::INFINITY); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(f32::INFINITY); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_infneg1.rs b/tests/fail/intrinsics/float_to_int_32_infneg1.rs index e1ba2224a08..d383fc5b50a 100644 --- a/tests/fail/intrinsics/float_to_int_32_infneg1.rs +++ b/tests/fail/intrinsics/float_to_int_32_infneg1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f32::NEG_INFINITY); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(f32::NEG_INFINITY); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_nan.rs b/tests/fail/intrinsics/float_to_int_32_nan.rs index 6c128d94a87..a39a5066b6f 100644 --- a/tests/fail/intrinsics/float_to_int_32_nan.rs +++ b/tests/fail/intrinsics/float_to_int_32_nan.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f32::NAN); - } //~ ERROR: cannot be represented in target type `u32` + float_to_int_unchecked::(f32::NAN); //~ ERROR: cannot be represented in target type `u32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_nanneg.rs b/tests/fail/intrinsics/float_to_int_32_nanneg.rs index 9bc628e9db9..71436eb3ba8 100644 --- a/tests/fail/intrinsics/float_to_int_32_nanneg.rs +++ b/tests/fail/intrinsics/float_to_int_32_nanneg.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-f32::NAN); - } //~ ERROR: cannot be represented in target type `u32` + float_to_int_unchecked::(-f32::NAN); //~ ERROR: cannot be represented in target type `u32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_neg.rs b/tests/fail/intrinsics/float_to_int_32_neg.rs index 188a9256db7..98ba964e47c 100644 --- a/tests/fail/intrinsics/float_to_int_32_neg.rs +++ b/tests/fail/intrinsics/float_to_int_32_neg.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-1.000000001f32); - } //~ ERROR: cannot be represented in target type `u32` + float_to_int_unchecked::(-1.000000001f32); //~ ERROR: cannot be represented in target type `u32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_too_big1.rs b/tests/fail/intrinsics/float_to_int_32_too_big1.rs index 787941e63e2..424b8fd965e 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big1.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_big1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(2147483648.0f32); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(2147483648.0f32); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_too_big2.rs b/tests/fail/intrinsics/float_to_int_32_too_big2.rs index 39b74cb0486..5c50926c4df 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big2.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_big2.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::((u32::MAX - 127) as f32); - } //~ ERROR: cannot be represented in target type `u32` + float_to_int_unchecked::((u32::MAX - 127) as f32); //~ ERROR: cannot be represented in target type `u32` + } } diff --git a/tests/fail/intrinsics/float_to_int_32_too_small1.rs b/tests/fail/intrinsics/float_to_int_32_too_small1.rs index a96738214bd..e0abd19d03f 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_small1.rs +++ b/tests/fail/intrinsics/float_to_int_32_too_small1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-2147483904.0f32); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(-2147483904.0f32); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_inf1.rs b/tests/fail/intrinsics/float_to_int_64_inf1.rs index 259ec883f6c..f5f842e58ec 100644 --- a/tests/fail/intrinsics/float_to_int_64_inf1.rs +++ b/tests/fail/intrinsics/float_to_int_64_inf1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::INFINITY); - } //~ ERROR: cannot be represented in target type `u128` + float_to_int_unchecked::(f64::INFINITY); //~ ERROR: cannot be represented in target type `u128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_infneg1.rs b/tests/fail/intrinsics/float_to_int_64_infneg1.rs index 3bc5ac710e9..244c25b31cb 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg1.rs +++ b/tests/fail/intrinsics/float_to_int_64_infneg1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::NEG_INFINITY); - } //~ ERROR: cannot be represented in target type `u128` + float_to_int_unchecked::(f64::NEG_INFINITY); //~ ERROR: cannot be represented in target type `u128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_infneg2.rs b/tests/fail/intrinsics/float_to_int_64_infneg2.rs index 81a79c4d211..f7a663d12a5 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg2.rs +++ b/tests/fail/intrinsics/float_to_int_64_infneg2.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::NEG_INFINITY); - } //~ ERROR: cannot be represented in target type `i128` + float_to_int_unchecked::(f64::NEG_INFINITY); //~ ERROR: cannot be represented in target type `i128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_nan.rs b/tests/fail/intrinsics/float_to_int_64_nan.rs index 47580ad5b2a..171cbcc5934 100644 --- a/tests/fail/intrinsics/float_to_int_64_nan.rs +++ b/tests/fail/intrinsics/float_to_int_64_nan.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::NAN); - } //~ ERROR: cannot be represented in target type `u32` + float_to_int_unchecked::(f64::NAN); //~ ERROR: cannot be represented in target type `u32` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_neg.rs b/tests/fail/intrinsics/float_to_int_64_neg.rs index 0e97c2f26bb..40b67e173b9 100644 --- a/tests/fail/intrinsics/float_to_int_64_neg.rs +++ b/tests/fail/intrinsics/float_to_int_64_neg.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-1.0000000000001f64); - } //~ ERROR: cannot be represented in target type `u128` + float_to_int_unchecked::(-1.0000000000001f64); //~ ERROR: cannot be represented in target type `u128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big1.rs b/tests/fail/intrinsics/float_to_int_64_too_big1.rs index fb75a793ded..e785123c4ca 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big1.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(2147483648.0f64); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(2147483648.0f64); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big2.rs b/tests/fail/intrinsics/float_to_int_64_too_big2.rs index 0c039ff8493..4bf31d8ac02 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big2.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big2.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(9223372036854775808.0f64); - } //~ ERROR: cannot be represented in target type `i64` + float_to_int_unchecked::(9223372036854775808.0f64); //~ ERROR: cannot be represented in target type `i64` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big3.rs b/tests/fail/intrinsics/float_to_int_64_too_big3.rs index b9d2775f032..9775a56724b 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big3.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big3.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(18446744073709551616.0f64); - } //~ ERROR: cannot be represented in target type `u64` + float_to_int_unchecked::(18446744073709551616.0f64); //~ ERROR: cannot be represented in target type `u64` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big4.rs b/tests/fail/intrinsics/float_to_int_64_too_big4.rs index 4a2dc7822f7..53ff06e1e46 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big4.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big4.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(u128::MAX as f64); - } //~ ERROR: cannot be represented in target type `u128` + float_to_int_unchecked::(u128::MAX as f64); //~ ERROR: cannot be represented in target type `u128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big5.rs b/tests/fail/intrinsics/float_to_int_64_too_big5.rs index bf1f797a000..44356ff1771 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big5.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big5.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); - } //~ ERROR: cannot be represented in target type `i128` + float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); //~ ERROR: cannot be represented in target type `i128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big6.rs b/tests/fail/intrinsics/float_to_int_64_too_big6.rs index 2b6d6359c9a..66f5be96bfd 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big6.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big6.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::MAX); - } //~ ERROR: cannot be represented in target type `u128` + float_to_int_unchecked::(f64::MAX); //~ ERROR: cannot be represented in target type `u128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_big7.rs b/tests/fail/intrinsics/float_to_int_64_too_big7.rs index e9b1333232c..18b380e8575 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big7.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_big7.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(f64::MIN); - } //~ ERROR: cannot be represented in target type `i128` + float_to_int_unchecked::(f64::MIN); //~ ERROR: cannot be represented in target type `i128` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small1.rs b/tests/fail/intrinsics/float_to_int_64_too_small1.rs index 652edf1931b..2a23b1dc8a4 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small1.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small1.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-2147483649.0f64); - } //~ ERROR: cannot be represented in target type `i32` + float_to_int_unchecked::(-2147483649.0f64); //~ ERROR: cannot be represented in target type `i32` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small2.rs b/tests/fail/intrinsics/float_to_int_64_too_small2.rs index d3d5559291b..7fc3effda5d 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small2.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small2.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-9223372036854777856.0f64); - } //~ ERROR: cannot be represented in target type `i64` + float_to_int_unchecked::(-9223372036854777856.0f64); //~ ERROR: cannot be represented in target type `i64` + } } diff --git a/tests/fail/intrinsics/float_to_int_64_too_small3.rs b/tests/fail/intrinsics/float_to_int_64_too_small3.rs index 0e22951a45c..2a8f9c36642 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small3.rs +++ b/tests/fail/intrinsics/float_to_int_64_too_small3.rs @@ -7,6 +7,6 @@ extern "rust-intrinsic" { fn main() { unsafe { - float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); - } //~ ERROR: cannot be represented in target type `i128` + float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); //~ ERROR: cannot be represented in target type `i128` + } } diff --git a/tests/fail/intrinsics/unchecked_add1.rs b/tests/fail/intrinsics/unchecked_add1.rs index 90d0a3d0123..5409f66e805 100644 --- a/tests/fail/intrinsics/unchecked_add1.rs +++ b/tests/fail/intrinsics/unchecked_add1.rs @@ -2,6 +2,6 @@ fn main() { // MAX overflow unsafe { - std::intrinsics::unchecked_add(40000u16, 30000); - } //~ ERROR overflow executing `unchecked_add` + std::intrinsics::unchecked_add(40000u16, 30000); //~ ERROR overflow executing `unchecked_add` + } } diff --git a/tests/fail/intrinsics/unchecked_add2.rs b/tests/fail/intrinsics/unchecked_add2.rs index 68e9fb4563e..5deef7ee5cc 100644 --- a/tests/fail/intrinsics/unchecked_add2.rs +++ b/tests/fail/intrinsics/unchecked_add2.rs @@ -2,6 +2,6 @@ fn main() { // MIN overflow unsafe { - std::intrinsics::unchecked_add(-30000i16, -8000); - } //~ ERROR overflow executing `unchecked_add` + std::intrinsics::unchecked_add(-30000i16, -8000); //~ ERROR overflow executing `unchecked_add` + } } diff --git a/tests/fail/intrinsics/unchecked_div1.rs b/tests/fail/intrinsics/unchecked_div1.rs index 23fc1514f1a..c06a5bdce93 100644 --- a/tests/fail/intrinsics/unchecked_div1.rs +++ b/tests/fail/intrinsics/unchecked_div1.rs @@ -2,6 +2,6 @@ fn main() { // MIN/-1 cannot be represented unsafe { - std::intrinsics::unchecked_div(i16::MIN, -1); - } //~ ERROR overflow in signed division (dividing MIN by -1) + std::intrinsics::unchecked_div(i16::MIN, -1); //~ ERROR overflow in signed division (dividing MIN by -1) + } } diff --git a/tests/fail/intrinsics/unchecked_mul1.rs b/tests/fail/intrinsics/unchecked_mul1.rs index f26d4d3d213..140bc9e6c75 100644 --- a/tests/fail/intrinsics/unchecked_mul1.rs +++ b/tests/fail/intrinsics/unchecked_mul1.rs @@ -2,6 +2,6 @@ fn main() { // MAX overflow unsafe { - std::intrinsics::unchecked_mul(300u16, 250u16); - } //~ ERROR overflow executing `unchecked_mul` + std::intrinsics::unchecked_mul(300u16, 250u16); //~ ERROR overflow executing `unchecked_mul` + } } diff --git a/tests/fail/intrinsics/unchecked_mul2.rs b/tests/fail/intrinsics/unchecked_mul2.rs index f3e20e8c295..c4d16084b3f 100644 --- a/tests/fail/intrinsics/unchecked_mul2.rs +++ b/tests/fail/intrinsics/unchecked_mul2.rs @@ -2,6 +2,6 @@ fn main() { // MIN overflow unsafe { - std::intrinsics::unchecked_mul(1_000_000_000i32, -4); - } //~ ERROR overflow executing `unchecked_mul` + std::intrinsics::unchecked_mul(1_000_000_000i32, -4); //~ ERROR overflow executing `unchecked_mul` + } } diff --git a/tests/fail/intrinsics/unchecked_sub1.rs b/tests/fail/intrinsics/unchecked_sub1.rs index 3ea5e618074..cff79f9135f 100644 --- a/tests/fail/intrinsics/unchecked_sub1.rs +++ b/tests/fail/intrinsics/unchecked_sub1.rs @@ -2,6 +2,6 @@ fn main() { // MIN overflow unsafe { - std::intrinsics::unchecked_sub(14u32, 22); - } //~ ERROR overflow executing `unchecked_sub` + std::intrinsics::unchecked_sub(14u32, 22); //~ ERROR overflow executing `unchecked_sub` + } } diff --git a/tests/fail/intrinsics/unchecked_sub2.rs b/tests/fail/intrinsics/unchecked_sub2.rs index 0e9892e58a5..9b741c2663d 100644 --- a/tests/fail/intrinsics/unchecked_sub2.rs +++ b/tests/fail/intrinsics/unchecked_sub2.rs @@ -2,6 +2,6 @@ fn main() { // MAX overflow unsafe { - std::intrinsics::unchecked_sub(30000i16, -7000); - } //~ ERROR overflow executing `unchecked_sub` + std::intrinsics::unchecked_sub(30000i16, -7000); //~ ERROR overflow executing `unchecked_sub` + } } diff --git a/tests/fail/panic/unwind_panic_abort.rs b/tests/fail/panic/unwind_panic_abort.rs index 7cb0c7b0279..6afcd7ae7ff 100644 --- a/tests/fail/panic/unwind_panic_abort.rs +++ b/tests/fail/panic/unwind_panic_abort.rs @@ -8,6 +8,6 @@ extern "Rust" { fn main() { unsafe { - miri_start_panic(&mut 0); - } //~ ERROR unwinding past a stack frame that does not allow unwinding + miri_start_panic(&mut 0); //~ ERROR unwinding past a stack frame that does not allow unwinding + } } diff --git a/tests/fail/stacked_borrows/illegal_write1.rs b/tests/fail/stacked_borrows/illegal_write1.rs index 5bdd4ef1f05..3b67accbbd2 100644 --- a/tests/fail/stacked_borrows/illegal_write1.rs +++ b/tests/fail/stacked_borrows/illegal_write1.rs @@ -4,8 +4,8 @@ fn main() { { let x: *mut u32 = xref as *const _ as *mut _; unsafe { - *x = 42; - } // invalidates shared ref, activates raw + *x = 42; // invalidates shared ref, activates raw + } } let _x = *xref; //~ ERROR borrow stack } diff --git a/tests/fail/stacked_borrows/illegal_write2.rs b/tests/fail/stacked_borrows/illegal_write2.rs index 25a9cc4012b..a106b4240c3 100644 --- a/tests/fail/stacked_borrows/illegal_write2.rs +++ b/tests/fail/stacked_borrows/illegal_write2.rs @@ -4,7 +4,7 @@ fn main() { drop(&mut *target); // reborrow // Now make sure our ref is still the only one. unsafe { - *target2 = 13; - } //~ ERROR borrow stack + *target2 = 13; //~ ERROR borrow stack + } let _val = *target; } diff --git a/tests/fail/stacked_borrows/illegal_write3.rs b/tests/fail/stacked_borrows/illegal_write3.rs index 4bbd1e56a74..5bf651b33aa 100644 --- a/tests/fail/stacked_borrows/illegal_write3.rs +++ b/tests/fail/stacked_borrows/illegal_write3.rs @@ -4,7 +4,7 @@ fn main() { let r#ref = ⌖ // freeze let ptr = r#ref as *const _ as *mut _; // raw ptr, with raw tag unsafe { - *ptr = 42; - } //~ ERROR only grants SharedReadOnly permission + *ptr = 42; //~ ERROR only grants SharedReadOnly permission + } let _val = *r#ref; } diff --git a/tests/fail/stacked_borrows/illegal_write6.rs b/tests/fail/stacked_borrows/illegal_write6.rs index 49ffb9a8604..07d57241205 100644 --- a/tests/fail/stacked_borrows/illegal_write6.rs +++ b/tests/fail/stacked_borrows/illegal_write6.rs @@ -8,7 +8,7 @@ fn foo(a: &mut u32, y: *mut u32) -> u32 { *a = 1; let _b = &*a; unsafe { - *y = 2; - } //~ ERROR: not granting access to tag + *y = 2; //~ ERROR: not granting access to tag + } return *a; } diff --git a/tests/fail/stacked_borrows/raw_tracking.rs b/tests/fail/stacked_borrows/raw_tracking.rs index 22898483bf1..0a99e4ce47e 100644 --- a/tests/fail/stacked_borrows/raw_tracking.rs +++ b/tests/fail/stacked_borrows/raw_tracking.rs @@ -8,8 +8,8 @@ fn main() { // Without raw pointer tracking, Stacked Borrows cannot distinguish raw1 and raw2, and thus // fails to realize that raw1 should not be used any more. unsafe { - *raw1 = 13; - } //~ ERROR does not exist in the borrow stack + *raw1 = 13; //~ ERROR does not exist in the borrow stack + } unsafe { *raw2 = 13; } diff --git a/tests/fail/stacked_borrows/shr_frozen_violation1.rs b/tests/fail/stacked_borrows/shr_frozen_violation1.rs index 803e8c6eb10..a6dd9ef4c2e 100644 --- a/tests/fail/stacked_borrows/shr_frozen_violation1.rs +++ b/tests/fail/stacked_borrows/shr_frozen_violation1.rs @@ -10,6 +10,6 @@ fn main() { fn unknown_code(x: &i32) { unsafe { - *(x as *const i32 as *mut i32) = 7; - } //~ ERROR only grants SharedReadOnly permission + *(x as *const i32 as *mut i32) = 7; //~ ERROR only grants SharedReadOnly permission + } } diff --git a/tests/fail/stacked_borrows/transmute-is-no-escape.rs b/tests/fail/stacked_borrows/transmute-is-no-escape.rs index 2a766d2c1b7..e23c893d6aa 100644 --- a/tests/fail/stacked_borrows/transmute-is-no-escape.rs +++ b/tests/fail/stacked_borrows/transmute-is-no-escape.rs @@ -11,6 +11,6 @@ fn main() { // `raw` still carries a tag, so we get another pointer to the same location that does not carry a tag let raw = (&mut x[1] as *mut i32).wrapping_offset(-1); unsafe { - *raw = 13; - } //~ ERROR borrow stack + *raw = 13; //~ ERROR borrow stack + } } diff --git a/tests/fail/stacked_borrows/unescaped_local.rs b/tests/fail/stacked_borrows/unescaped_local.rs index c807f936d12..bfc937bb12b 100644 --- a/tests/fail/stacked_borrows/unescaped_local.rs +++ b/tests/fail/stacked_borrows/unescaped_local.rs @@ -5,6 +5,6 @@ fn main() { let raw = &mut x as *mut i32 as usize as *mut i32; let _ptr = &mut x; unsafe { - *raw = 13; - } //~ ERROR borrow stack + *raw = 13; //~ ERROR borrow stack + } } diff --git a/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs b/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs index ca892f83209..e96f08fc9a7 100644 --- a/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs +++ b/tests/fail/unaligned_pointers/intptrcast_alignment_check.rs @@ -13,7 +13,7 @@ fn main() { let base_addr_aligned = if base_addr % 2 == 0 { base_addr } else { base_addr + 1 }; let u16_ptr = base_addr_aligned as *mut u16; unsafe { - *u16_ptr = 2; - } //~ERROR memory with alignment 1, but alignment 2 is required + *u16_ptr = 2; //~ERROR memory with alignment 1, but alignment 2 is required + } println!("{:?}", x); } diff --git a/tests/fail/validity/transmute_through_ptr.rs b/tests/fail/validity/transmute_through_ptr.rs index 23da1ba1257..4af3b8aef6a 100644 --- a/tests/fail/validity/transmute_through_ptr.rs +++ b/tests/fail/validity/transmute_through_ptr.rs @@ -7,8 +7,8 @@ enum Bool { fn evil(x: &mut Bool) { let x = x as *mut _ as *mut u32; unsafe { - *x = 44; - } // out-of-bounds enum tag + *x = 44; // out-of-bounds enum tag + } } #[rustfmt::skip] // rustfmt bug: https://github.com/rust-lang/rustfmt/issues/5391 diff --git a/tests/fail/zst2.rs b/tests/fail/zst2.rs index cd9cf3618d2..2499f79142d 100644 --- a/tests/fail/zst2.rs +++ b/tests/fail/zst2.rs @@ -12,6 +12,6 @@ fn main() { let x = &mut *x_box as *mut _ as *mut [u8; 0]; drop(x_box); unsafe { - *x = zst_val; - } //~ ERROR dereferenced after this allocation got freed + *x = zst_val; //~ ERROR dereferenced after this allocation got freed + } } diff --git a/tests/fail/zst3.rs b/tests/fail/zst3.rs index defb5a626ba..741374c7ad9 100644 --- a/tests/fail/zst3.rs +++ b/tests/fail/zst3.rs @@ -17,6 +17,6 @@ fn main() { // One byte further is OOB. let x = x.wrapping_offset(1); unsafe { - *(x as *mut [u8; 0]) = zst_val; - } //~ ERROR out-of-bounds + *(x as *mut [u8; 0]) = zst_val; //~ ERROR out-of-bounds + } } From f1044d2f774b3525ab28372ccd2be30911f2eb29 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 21 Jun 2022 11:42:19 -0700 Subject: [PATCH 3/3] Bless stderr files after rustfmt --- tests/fail/box-cell-alias.stderr | 10 +++++----- .../maybe_null_pointer_write_zst.stderr | 4 ++-- tests/fail/intrinsics/copy_null.stderr | 4 ++-- tests/fail/intrinsics/copy_unaligned.stderr | 4 ++-- tests/fail/intrinsics/exact_div1.stderr | 4 ++-- tests/fail/intrinsics/exact_div2.stderr | 4 ++-- tests/fail/intrinsics/exact_div3.stderr | 4 ++-- tests/fail/intrinsics/exact_div4.stderr | 4 ++-- .../intrinsics/float_to_int_32_inf1.stderr | 4 ++-- .../intrinsics/float_to_int_32_infneg1.stderr | 4 ++-- .../fail/intrinsics/float_to_int_32_nan.stderr | 4 ++-- .../intrinsics/float_to_int_32_nanneg.stderr | 4 ++-- .../fail/intrinsics/float_to_int_32_neg.stderr | 4 ++-- .../intrinsics/float_to_int_32_too_big1.stderr | 4 ++-- .../intrinsics/float_to_int_32_too_big2.stderr | 4 ++-- .../float_to_int_32_too_small1.stderr | 4 ++-- .../intrinsics/float_to_int_64_inf1.stderr | 4 ++-- .../intrinsics/float_to_int_64_infneg1.stderr | 4 ++-- .../intrinsics/float_to_int_64_infneg2.stderr | 4 ++-- .../fail/intrinsics/float_to_int_64_nan.stderr | 4 ++-- .../fail/intrinsics/float_to_int_64_neg.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big1.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big2.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big3.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big4.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big5.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big6.stderr | 4 ++-- .../intrinsics/float_to_int_64_too_big7.stderr | 4 ++-- .../float_to_int_64_too_small1.stderr | 4 ++-- .../float_to_int_64_too_small2.stderr | 4 ++-- .../float_to_int_64_too_small3.stderr | 4 ++-- tests/fail/intrinsics/unchecked_add1.stderr | 4 ++-- tests/fail/intrinsics/unchecked_add2.stderr | 4 ++-- tests/fail/intrinsics/unchecked_div1.stderr | 4 ++-- tests/fail/intrinsics/unchecked_mul1.stderr | 4 ++-- tests/fail/intrinsics/unchecked_mul2.stderr | 4 ++-- tests/fail/intrinsics/unchecked_sub1.stderr | 4 ++-- tests/fail/intrinsics/unchecked_sub2.stderr | 4 ++-- tests/fail/panic/unwind_panic_abort.stderr | 4 ++-- .../fail/stacked_borrows/illegal_write1.stderr | 4 ++-- .../fail/stacked_borrows/illegal_write2.stderr | 10 +++++----- .../fail/stacked_borrows/illegal_write3.stderr | 10 +++++----- .../fail/stacked_borrows/illegal_write6.stderr | 7 ++++--- tests/fail/stacked_borrows/raw_tracking.stderr | 10 +++++----- .../shr_frozen_violation1.stderr | 18 +++++++++--------- .../transmute-is-no-escape.stderr | 10 +++++----- .../stacked_borrows/unescaped_local.stderr | 10 +++++----- .../intptrcast_alignment_check.stderr | 4 ++-- tests/fail/zst2.stderr | 4 ++-- tests/fail/zst3.stderr | 4 ++-- 50 files changed, 127 insertions(+), 126 deletions(-) diff --git a/tests/fail/box-cell-alias.stderr b/tests/fail/box-cell-alias.stderr index 44813be9780..e5a3ad3d33a 100644 --- a/tests/fail/box-cell-alias.stderr +++ b/tests/fail/box-cell-alias.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: trying to reborrow for SharedReadWrite permission at ALLOC[0x0], but that tag does not exist in the borrow stack for this location --> $DIR/box-cell-alias.rs:LL:CC | -LL | unsafe { (*ptr).set(20); } - | ^^^^^^^^^^^^^^ - | | - | trying to reborrow for SharedReadWrite permission at ALLOC[0x0], but that tag does not exist in the borrow stack for this location - | this error occurs as part of a reborrow at ALLOC[0x0..0x1] +LL | (*ptr).set(20); + | ^^^^^^^^^^^^^^ + | | + | trying to reborrow for SharedReadWrite permission at ALLOC[0x0], but that tag does not exist in the borrow stack for this location + | this error occurs as part of a reborrow at ALLOC[0x0..0x1] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.stderr b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.stderr index dc810424abc..79fd2ba0868 100644 --- a/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.stderr +++ b/tests/fail/dangling_pointers/maybe_null_pointer_write_zst.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: dereferencing pointer failed: ALLOC has size 1, so pointer at offset -2048 is out-of-bounds --> $DIR/maybe_null_pointer_write_zst.rs:LL:CC | -LL | unsafe { *ptr = zst_val; } - | ^^^^^^^^^^^^^^ dereferencing pointer failed: ALLOC has size 1, so pointer at offset -2048 is out-of-bounds +LL | *ptr = zst_val; + | ^^^^^^^^^^^^^^ dereferencing pointer failed: ALLOC has size 1, so pointer at offset -2048 is out-of-bounds | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/copy_null.stderr b/tests/fail/intrinsics/copy_null.stderr index 461f529fa85..bb5a8742e90 100644 --- a/tests/fail/intrinsics/copy_null.stderr +++ b/tests/fail/intrinsics/copy_null.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: memory access failed: null pointer is not a valid pointer --> $DIR/copy_null.rs:LL:CC | -LL | unsafe { copy_nonoverlapping(std::ptr::null(), ptr, 0); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: null pointer is not a valid pointer +LL | copy_nonoverlapping(std::ptr::null(), ptr, 0); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: null pointer is not a valid pointer | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/copy_unaligned.stderr b/tests/fail/intrinsics/copy_unaligned.stderr index b99588698d2..b244eaeb419 100644 --- a/tests/fail/intrinsics/copy_unaligned.stderr +++ b/tests/fail/intrinsics/copy_unaligned.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: accessing memory with alignment ALIGN, but alignment ALIGN is required --> $DIR/copy_unaligned.rs:LL:CC | -LL | unsafe { copy_nonoverlapping(&data[5], ptr, 0); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required +LL | copy_nonoverlapping(&data[5], ptr, 0); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/exact_div1.stderr b/tests/fail/intrinsics/exact_div1.stderr index a0f03b201a8..66f8168fade 100644 --- a/tests/fail/intrinsics/exact_div1.stderr +++ b/tests/fail/intrinsics/exact_div1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: calculating the remainder with a divisor of zero --> $DIR/exact_div1.rs:LL:CC | -LL | unsafe { std::intrinsics::exact_div(2, 0); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calculating the remainder with a divisor of zero +LL | std::intrinsics::exact_div(2, 0); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calculating the remainder with a divisor of zero | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/exact_div2.stderr b/tests/fail/intrinsics/exact_div2.stderr index 78a85c9caac..2c102dd0b55 100644 --- a/tests/fail/intrinsics/exact_div2.stderr +++ b/tests/fail/intrinsics/exact_div2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: exact_div: 2_u16 cannot be divided by 3_u16 without remainder --> $DIR/exact_div2.rs:LL:CC | -LL | unsafe { std::intrinsics::exact_div(2u16, 3); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ exact_div: 2_u16 cannot be divided by 3_u16 without remainder +LL | std::intrinsics::exact_div(2u16, 3); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ exact_div: 2_u16 cannot be divided by 3_u16 without remainder | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/exact_div3.stderr b/tests/fail/intrinsics/exact_div3.stderr index 3062b60d468..61eacdc65ff 100644 --- a/tests/fail/intrinsics/exact_div3.stderr +++ b/tests/fail/intrinsics/exact_div3.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: exact_div: -19_i8 cannot be divided by 2_i8 without remainder --> $DIR/exact_div3.rs:LL:CC | -LL | unsafe { std::intrinsics::exact_div(-19i8, 2); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ exact_div: -19_i8 cannot be divided by 2_i8 without remainder +LL | std::intrinsics::exact_div(-19i8, 2); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ exact_div: -19_i8 cannot be divided by 2_i8 without remainder | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/exact_div4.stderr b/tests/fail/intrinsics/exact_div4.stderr index 1ae67ad87a5..a3f5aafbe2d 100644 --- a/tests/fail/intrinsics/exact_div4.stderr +++ b/tests/fail/intrinsics/exact_div4.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow in signed remainder (dividing MIN by -1) --> $DIR/exact_div4.rs:LL:CC | -LL | unsafe { std::intrinsics::exact_div(i64::MIN, -1); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow in signed remainder (dividing MIN by -1) +LL | std::intrinsics::exact_div(i64::MIN, -1); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow in signed remainder (dividing MIN by -1) | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_inf1.stderr b/tests/fail/intrinsics/float_to_int_32_inf1.stderr index cdf232d93eb..b12fd13b5f4 100644 --- a/tests/fail/intrinsics/float_to_int_32_inf1.stderr +++ b/tests/fail/intrinsics/float_to_int_32_inf1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `i32` --> $DIR/float_to_int_32_inf1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f32::INFINITY); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(f32::INFINITY); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_infneg1.stderr b/tests/fail/intrinsics/float_to_int_32_infneg1.stderr index ae730119368..d9223462bfa 100644 --- a/tests/fail/intrinsics/float_to_int_32_infneg1.stderr +++ b/tests/fail/intrinsics/float_to_int_32_infneg1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i32` --> $DIR/float_to_int_32_infneg1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f32::NEG_INFINITY); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(f32::NEG_INFINITY); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_nan.stderr b/tests/fail/intrinsics/float_to_int_32_nan.stderr index 9c20abef78d..cb8764174ab 100644 --- a/tests/fail/intrinsics/float_to_int_32_nan.stderr +++ b/tests/fail/intrinsics/float_to_int_32_nan.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` --> $DIR/float_to_int_32_nan.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f32::NAN); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` +LL | float_to_int_unchecked::(f32::NAN); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_nanneg.stderr b/tests/fail/intrinsics/float_to_int_32_nanneg.stderr index f5675fd654d..49e19bf9635 100644 --- a/tests/fail/intrinsics/float_to_int_32_nanneg.stderr +++ b/tests/fail/intrinsics/float_to_int_32_nanneg.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` --> $DIR/float_to_int_32_nanneg.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-f32::NAN); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` +LL | float_to_int_unchecked::(-f32::NAN); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_neg.stderr b/tests/fail/intrinsics/float_to_int_32_neg.stderr index 3b7c755af65..5d847166a07 100644 --- a/tests/fail/intrinsics/float_to_int_32_neg.stderr +++ b/tests/fail/intrinsics/float_to_int_32_neg.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u32` --> $DIR/float_to_int_32_neg.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-1.000000001f32); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u32` +LL | float_to_int_unchecked::(-1.000000001f32); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_too_big1.stderr b/tests/fail/intrinsics/float_to_int_32_too_big1.stderr index abfda9eef0a..be6ad1f381d 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big1.stderr +++ b/tests/fail/intrinsics/float_to_int_32_too_big1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 2.14748365E+9 which cannot be represented in target type `i32` --> $DIR/float_to_int_32_too_big1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(2147483648.0f32); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2.14748365E+9 which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(2147483648.0f32); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2.14748365E+9 which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_too_big2.stderr b/tests/fail/intrinsics/float_to_int_32_too_big2.stderr index 2680d0c9908..d7fbe5a34b5 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_big2.stderr +++ b/tests/fail/intrinsics/float_to_int_32_too_big2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 4.2949673E+9 which cannot be represented in target type `u32` --> $DIR/float_to_int_32_too_big2.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::((u32::MAX-127) as f32); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 4.2949673E+9 which cannot be represented in target type `u32` +LL | float_to_int_unchecked::((u32::MAX - 127) as f32); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 4.2949673E+9 which cannot be represented in target type `u32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_32_too_small1.stderr b/tests/fail/intrinsics/float_to_int_32_too_small1.stderr index b03bd380df4..2c225b85ec9 100644 --- a/tests/fail/intrinsics/float_to_int_32_too_small1.stderr +++ b/tests/fail/intrinsics/float_to_int_32_too_small1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -2.1474839E+9 which cannot be represented in target type `i32` --> $DIR/float_to_int_32_too_small1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-2147483904.0f32); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2.1474839E+9 which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(-2147483904.0f32); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2.1474839E+9 which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_inf1.stderr b/tests/fail/intrinsics/float_to_int_64_inf1.stderr index 7509844cfd4..7bb1f08afa8 100644 --- a/tests/fail/intrinsics/float_to_int_64_inf1.stderr +++ b/tests/fail/intrinsics/float_to_int_64_inf1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `u128` --> $DIR/float_to_int_64_inf1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::INFINITY); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `u128` +LL | float_to_int_unchecked::(f64::INFINITY); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on +Inf which cannot be represented in target type `u128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_infneg1.stderr b/tests/fail/intrinsics/float_to_int_64_infneg1.stderr index 539cd52d83d..eb96f6869a1 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg1.stderr +++ b/tests/fail/intrinsics/float_to_int_64_infneg1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `u128` --> $DIR/float_to_int_64_infneg1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::NEG_INFINITY); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `u128` +LL | float_to_int_unchecked::(f64::NEG_INFINITY); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `u128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_infneg2.stderr b/tests/fail/intrinsics/float_to_int_64_infneg2.stderr index ceb18c3f412..a2f847be907 100644 --- a/tests/fail/intrinsics/float_to_int_64_infneg2.stderr +++ b/tests/fail/intrinsics/float_to_int_64_infneg2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i128` --> $DIR/float_to_int_64_infneg2.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::NEG_INFINITY); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i128` +LL | float_to_int_unchecked::(f64::NEG_INFINITY); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -Inf which cannot be represented in target type `i128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_nan.stderr b/tests/fail/intrinsics/float_to_int_64_nan.stderr index eee8d2fac0b..8da85497582 100644 --- a/tests/fail/intrinsics/float_to_int_64_nan.stderr +++ b/tests/fail/intrinsics/float_to_int_64_nan.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` --> $DIR/float_to_int_64_nan.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::NAN); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` +LL | float_to_int_unchecked::(f64::NAN); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on NaN which cannot be represented in target type `u32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_neg.stderr b/tests/fail/intrinsics/float_to_int_64_neg.stderr index 384c0232465..35bb0aaa22c 100644 --- a/tests/fail/intrinsics/float_to_int_64_neg.stderr +++ b/tests/fail/intrinsics/float_to_int_64_neg.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u128` --> $DIR/float_to_int_64_neg.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-1.0000000000001f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u128` +LL | float_to_int_unchecked::(-1.0000000000001f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1 which cannot be represented in target type `u128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big1.stderr b/tests/fail/intrinsics/float_to_int_64_too_big1.stderr index bb5b10a2710..e031e00709e 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big1.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 2147483648 which cannot be represented in target type `i32` --> $DIR/float_to_int_64_too_big1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(2147483648.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2147483648 which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(2147483648.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2147483648 which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big2.stderr b/tests/fail/intrinsics/float_to_int_64_too_big2.stderr index a4d57c2f5ce..8c4478603fb 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big2.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 9.2233720368547758E+18 which cannot be represented in target type `i64` --> $DIR/float_to_int_64_too_big2.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(9223372036854775808.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 9.2233720368547758E+18 which cannot be represented in target type `i64` +LL | float_to_int_unchecked::(9223372036854775808.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 9.2233720368547758E+18 which cannot be represented in target type `i64` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big3.stderr b/tests/fail/intrinsics/float_to_int_64_too_big3.stderr index 2b7379fcbd3..d7f97f37de5 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big3.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big3.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 1.8446744073709552E+19 which cannot be represented in target type `u64` --> $DIR/float_to_int_64_too_big3.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(18446744073709551616.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 1.8446744073709552E+19 which cannot be represented in target type `u64` +LL | float_to_int_unchecked::(18446744073709551616.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 1.8446744073709552E+19 which cannot be represented in target type `u64` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big4.stderr b/tests/fail/intrinsics/float_to_int_64_too_big4.stderr index d30817607b9..cfac443f4c9 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big4.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big4.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 3.4028236692093846E+38 which cannot be represented in target type `u128` --> $DIR/float_to_int_64_too_big4.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(u128::MAX as f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 3.4028236692093846E+38 which cannot be represented in target type `u128` +LL | float_to_int_unchecked::(u128::MAX as f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 3.4028236692093846E+38 which cannot be represented in target type `u128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big5.stderr b/tests/fail/intrinsics/float_to_int_64_too_big5.stderr index f6b0c0a3527..a0d501dad30 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big5.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big5.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 2.4028236692093845E+38 which cannot be represented in target type `i128` --> $DIR/float_to_int_64_too_big5.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2.4028236692093845E+38 which cannot be represented in target type `i128` +LL | float_to_int_unchecked::(240282366920938463463374607431768211455.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 2.4028236692093845E+38 which cannot be represented in target type `i128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big6.stderr b/tests/fail/intrinsics/float_to_int_64_too_big6.stderr index e0eab8148b0..afb5d4ffe72 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big6.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big6.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on 1.7976931348623157E+308 which cannot be represented in target type `u128` --> $DIR/float_to_int_64_too_big6.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::MAX); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 1.7976931348623157E+308 which cannot be represented in target type `u128` +LL | float_to_int_unchecked::(f64::MAX); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on 1.7976931348623157E+308 which cannot be represented in target type `u128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_big7.stderr b/tests/fail/intrinsics/float_to_int_64_too_big7.stderr index a291b21c7aa..291acf529b4 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_big7.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_big7.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -1.7976931348623157E+308 which cannot be represented in target type `i128` --> $DIR/float_to_int_64_too_big7.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(f64::MIN); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1.7976931348623157E+308 which cannot be represented in target type `i128` +LL | float_to_int_unchecked::(f64::MIN); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -1.7976931348623157E+308 which cannot be represented in target type `i128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_small1.stderr b/tests/fail/intrinsics/float_to_int_64_too_small1.stderr index 81ca218505d..ceb62597269 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small1.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_small1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -2147483649 which cannot be represented in target type `i32` --> $DIR/float_to_int_64_too_small1.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-2147483649.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2147483649 which cannot be represented in target type `i32` +LL | float_to_int_unchecked::(-2147483649.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2147483649 which cannot be represented in target type `i32` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_small2.stderr b/tests/fail/intrinsics/float_to_int_64_too_small2.stderr index 245f5cf0238..f8255c2daca 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small2.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_small2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -9.2233720368547778E+18 which cannot be represented in target type `i64` --> $DIR/float_to_int_64_too_small2.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-9223372036854777856.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -9.2233720368547778E+18 which cannot be represented in target type `i64` +LL | float_to_int_unchecked::(-9223372036854777856.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -9.2233720368547778E+18 which cannot be represented in target type `i64` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/float_to_int_64_too_small3.stderr b/tests/fail/intrinsics/float_to_int_64_too_small3.stderr index f684ed2cde9..6bfb6f1f18d 100644 --- a/tests/fail/intrinsics/float_to_int_64_too_small3.stderr +++ b/tests/fail/intrinsics/float_to_int_64_too_small3.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: `float_to_int_unchecked` intrinsic called on -2.4028236692093845E+38 which cannot be represented in target type `i128` --> $DIR/float_to_int_64_too_small3.rs:LL:CC | -LL | unsafe { float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2.4028236692093845E+38 which cannot be represented in target type `i128` +LL | float_to_int_unchecked::(-240282366920938463463374607431768211455.0f64); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `float_to_int_unchecked` intrinsic called on -2.4028236692093845E+38 which cannot be represented in target type `i128` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_add1.stderr b/tests/fail/intrinsics/unchecked_add1.stderr index b967b46ac9b..403bbbac514 100644 --- a/tests/fail/intrinsics/unchecked_add1.stderr +++ b/tests/fail/intrinsics/unchecked_add1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_add` --> $DIR/unchecked_add1.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_add(40000u16, 30000); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_add` +LL | std::intrinsics::unchecked_add(40000u16, 30000); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_add` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_add2.stderr b/tests/fail/intrinsics/unchecked_add2.stderr index 18a116b7da9..4881fce719e 100644 --- a/tests/fail/intrinsics/unchecked_add2.stderr +++ b/tests/fail/intrinsics/unchecked_add2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_add` --> $DIR/unchecked_add2.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_add(-30000i16, -8000); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_add` +LL | std::intrinsics::unchecked_add(-30000i16, -8000); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_add` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_div1.stderr b/tests/fail/intrinsics/unchecked_div1.stderr index f153e4efd98..4792608961d 100644 --- a/tests/fail/intrinsics/unchecked_div1.stderr +++ b/tests/fail/intrinsics/unchecked_div1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow in signed division (dividing MIN by -1) --> $DIR/unchecked_div1.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_div(i16::MIN, -1); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow in signed division (dividing MIN by -1) +LL | std::intrinsics::unchecked_div(i16::MIN, -1); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow in signed division (dividing MIN by -1) | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_mul1.stderr b/tests/fail/intrinsics/unchecked_mul1.stderr index 5372ba9933a..e94676fdfed 100644 --- a/tests/fail/intrinsics/unchecked_mul1.stderr +++ b/tests/fail/intrinsics/unchecked_mul1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_mul` --> $DIR/unchecked_mul1.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_mul(300u16, 250u16); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_mul` +LL | std::intrinsics::unchecked_mul(300u16, 250u16); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_mul` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_mul2.stderr b/tests/fail/intrinsics/unchecked_mul2.stderr index 20a44d2422a..493e04e4663 100644 --- a/tests/fail/intrinsics/unchecked_mul2.stderr +++ b/tests/fail/intrinsics/unchecked_mul2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_mul` --> $DIR/unchecked_mul2.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_mul(1_000_000_000i32, -4); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_mul` +LL | std::intrinsics::unchecked_mul(1_000_000_000i32, -4); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_mul` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_sub1.stderr b/tests/fail/intrinsics/unchecked_sub1.stderr index 12abfed8ff7..838005dc1e3 100644 --- a/tests/fail/intrinsics/unchecked_sub1.stderr +++ b/tests/fail/intrinsics/unchecked_sub1.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_sub` --> $DIR/unchecked_sub1.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_sub(14u32, 22); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_sub` +LL | std::intrinsics::unchecked_sub(14u32, 22); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_sub` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/intrinsics/unchecked_sub2.stderr b/tests/fail/intrinsics/unchecked_sub2.stderr index d62d2de2f93..dc4b1701987 100644 --- a/tests/fail/intrinsics/unchecked_sub2.stderr +++ b/tests/fail/intrinsics/unchecked_sub2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: overflow executing `unchecked_sub` --> $DIR/unchecked_sub2.rs:LL:CC | -LL | unsafe { std::intrinsics::unchecked_sub(30000i16, -7000); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_sub` +LL | std::intrinsics::unchecked_sub(30000i16, -7000); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow executing `unchecked_sub` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/panic/unwind_panic_abort.stderr b/tests/fail/panic/unwind_panic_abort.stderr index 7ae965156f0..7094aebd613 100644 --- a/tests/fail/panic/unwind_panic_abort.stderr +++ b/tests/fail/panic/unwind_panic_abort.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding --> $DIR/unwind_panic_abort.rs:LL:CC | -LL | unsafe { miri_start_panic(&mut 0); } - | ^^^^^^^^^^^^^^^^^^^^^^^^ unwinding past a stack frame that does not allow unwinding +LL | miri_start_panic(&mut 0); + | ^^^^^^^^^^^^^^^^^^^^^^^^ unwinding past a stack frame that does not allow unwinding | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/stacked_borrows/illegal_write1.stderr b/tests/fail/stacked_borrows/illegal_write1.stderr index 76639960a92..a70a45f2235 100644 --- a/tests/fail/stacked_borrows/illegal_write1.stderr +++ b/tests/fail/stacked_borrows/illegal_write1.stderr @@ -17,8 +17,8 @@ LL | let xref = &*target; help: was later invalidated at offsets [0x0..0x4] --> $DIR/illegal_write1.rs:LL:CC | -LL | unsafe { *x = 42; } // invalidates shared ref, activates raw - | ^^^^^^^ +LL | *x = 42; // invalidates shared ref, activates raw + | ^^^^^^^ = note: inside `main` at $DIR/illegal_write1.rs:LL:CC note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace diff --git a/tests/fail/stacked_borrows/illegal_write2.stderr b/tests/fail/stacked_borrows/illegal_write2.stderr index 3a225123d1f..d2a06cc386a 100644 --- a/tests/fail/stacked_borrows/illegal_write2.stderr +++ b/tests/fail/stacked_borrows/illegal_write2.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location --> $DIR/illegal_write2.rs:LL:CC | -LL | unsafe { *target2 = 13; } - | ^^^^^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *target2 = 13; + | ^^^^^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/stacked_borrows/illegal_write3.stderr b/tests/fail/stacked_borrows/illegal_write3.stderr index 0dc948b2915..fc87557ea9b 100644 --- a/tests/fail/stacked_borrows/illegal_write3.stderr +++ b/tests/fail/stacked_borrows/illegal_write3.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location --> $DIR/illegal_write3.rs:LL:CC | -LL | unsafe { *ptr = 42; } - | ^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *ptr = 42; + | ^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/stacked_borrows/illegal_write6.stderr b/tests/fail/stacked_borrows/illegal_write6.stderr index a58abc8377a..3a7fc0ef811 100644 --- a/tests/fail/stacked_borrows/illegal_write6.stderr +++ b/tests/fail/stacked_borrows/illegal_write6.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: not granting access to tag because incompatible item is protected: [Unique for (call ID)] --> $DIR/illegal_write6.rs:LL:CC | -LL | unsafe { *y = 2; } - | ^^^^^^ not granting access to tag because incompatible item is protected: [Unique for (call ID)] +LL | *y = 2; + | ^^^^^^ not granting access to tag because incompatible item is protected: [Unique for (call ID)] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information @@ -22,7 +22,8 @@ help: this protector is live for this call LL | / fn foo(a: &mut u32, y: *mut u32) -> u32 { LL | | *a = 1; LL | | let _b = &*a; -LL | | unsafe { *y = 2; } +LL | | unsafe { +... | LL | | return *a; LL | | } | |_^ diff --git a/tests/fail/stacked_borrows/raw_tracking.stderr b/tests/fail/stacked_borrows/raw_tracking.stderr index 93ae613c3c6..60a277ee057 100644 --- a/tests/fail/stacked_borrows/raw_tracking.stderr +++ b/tests/fail/stacked_borrows/raw_tracking.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location --> $DIR/raw_tracking.rs:LL:CC | -LL | unsafe { *raw1 = 13; } - | ^^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *raw1 = 13; + | ^^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/stacked_borrows/shr_frozen_violation1.stderr b/tests/fail/stacked_borrows/shr_frozen_violation1.stderr index a2487cca278..0808d8471b4 100644 --- a/tests/fail/stacked_borrows/shr_frozen_violation1.stderr +++ b/tests/fail/stacked_borrows/shr_frozen_violation1.stderr @@ -1,25 +1,25 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location --> $DIR/shr_frozen_violation1.rs:LL:CC | -LL | unsafe { *(x as *const i32 as *mut i32) = 7; } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *(x as *const i32 as *mut i32) = 7; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag only grants SharedReadOnly permission for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information help: tag was most recently created at offsets [0x0..0x4] --> $DIR/shr_frozen_violation1.rs:LL:CC | -LL | unsafe { *(x as *const i32 as *mut i32) = 7; } - | ^ +LL | *(x as *const i32 as *mut i32) = 7; + | ^ = note: inside `unknown_code` at $DIR/shr_frozen_violation1.rs:LL:CC note: inside `foo` at $DIR/shr_frozen_violation1.rs:LL:CC --> $DIR/shr_frozen_violation1.rs:LL:CC | -LL | unknown_code(&*x); - | ^^^^^^^^^^^^^^^^^ +LL | unknown_code(&*x); + | ^^^^^^^^^^^^^^^^^ note: inside `main` at $DIR/shr_frozen_violation1.rs:LL:CC --> $DIR/shr_frozen_violation1.rs:LL:CC | diff --git a/tests/fail/stacked_borrows/transmute-is-no-escape.stderr b/tests/fail/stacked_borrows/transmute-is-no-escape.stderr index 75d74ce3934..c077e37844d 100644 --- a/tests/fail/stacked_borrows/transmute-is-no-escape.stderr +++ b/tests/fail/stacked_borrows/transmute-is-no-escape.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location --> $DIR/transmute-is-no-escape.rs:LL:CC | -LL | unsafe { *raw = 13; } - | ^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *raw = 13; + | ^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/stacked_borrows/unescaped_local.stderr b/tests/fail/stacked_borrows/unescaped_local.stderr index 42a81245f2a..616c60b8aa1 100644 --- a/tests/fail/stacked_borrows/unescaped_local.stderr +++ b/tests/fail/stacked_borrows/unescaped_local.stderr @@ -1,11 +1,11 @@ error: Undefined Behavior: attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location --> $DIR/unescaped_local.rs:LL:CC | -LL | unsafe { *raw = 13; } - | ^^^^^^^^^ - | | - | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location - | this error occurs as part of an access at ALLOC[0x0..0x4] +LL | *raw = 13; + | ^^^^^^^^^ + | | + | attempting a write access using at ALLOC[0x0], but that tag does not exist in the borrow stack for this location + | this error occurs as part of an access at ALLOC[0x0..0x4] | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information diff --git a/tests/fail/unaligned_pointers/intptrcast_alignment_check.stderr b/tests/fail/unaligned_pointers/intptrcast_alignment_check.stderr index 8e0986c4533..fe63b05a550 100644 --- a/tests/fail/unaligned_pointers/intptrcast_alignment_check.stderr +++ b/tests/fail/unaligned_pointers/intptrcast_alignment_check.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: accessing memory with alignment ALIGN, but alignment ALIGN is required --> $DIR/intptrcast_alignment_check.rs:LL:CC | -LL | unsafe { *u16_ptr = 2; } - | ^^^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required +LL | *u16_ptr = 2; + | ^^^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required | = help: this usually indicates that your program performed an invalid operation and caused Undefined Behavior = help: but due to `-Zmiri-symbolic-alignment-check`, alignment errors can also be false positives diff --git a/tests/fail/zst2.stderr b/tests/fail/zst2.stderr index 088bb2a1ccf..0df2098d2e1 100644 --- a/tests/fail/zst2.stderr +++ b/tests/fail/zst2.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: pointer to ALLOC was dereferenced after this allocation got freed --> $DIR/zst2.rs:LL:CC | -LL | unsafe { *x = zst_val; } - | ^^^^^^^^^^^^ pointer to ALLOC was dereferenced after this allocation got freed +LL | *x = zst_val; + | ^^^^^^^^^^^^ pointer to ALLOC was dereferenced after this allocation got freed | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information diff --git a/tests/fail/zst3.stderr b/tests/fail/zst3.stderr index a7d84dcaad5..dce0d7b3891 100644 --- a/tests/fail/zst3.stderr +++ b/tests/fail/zst3.stderr @@ -1,8 +1,8 @@ error: Undefined Behavior: dereferencing pointer failed: ALLOC has size 1, so pointer at offset 2 is out-of-bounds --> $DIR/zst3.rs:LL:CC | -LL | unsafe { *(x as *mut [u8; 0]) = zst_val; } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereferencing pointer failed: ALLOC has size 1, so pointer at offset 2 is out-of-bounds +LL | *(x as *mut [u8; 0]) = zst_val; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereferencing pointer failed: ALLOC has size 1, so pointer at offset 2 is out-of-bounds | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information