Manual adjustments

tests/fail/box-cell-alias.rs

@@ -7,8 +7,8 @@ use std::cell::Cell;
 fn helper(val: Box<Cell<u8>>, ptr: *const Cell<u8>) -> 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()
 }
 

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
+    }
 }

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
+    }
 }

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
+    }
 }

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
+    }
 }

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
+    }
 }

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
+    }
 }

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)
+    }
 }

tests/fail/intrinsics/float_to_int_32_inf1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, i32>(f32::INFINITY);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f32, i32>(f32::INFINITY); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_infneg1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, i32>(f32::NEG_INFINITY);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f32, i32>(f32::NEG_INFINITY); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_nan.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, u32>(f32::NAN);
-    } //~ ERROR: cannot be represented in target type `u32`
+        float_to_int_unchecked::<f32, u32>(f32::NAN); //~ ERROR: cannot be represented in target type `u32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_nanneg.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, u32>(-f32::NAN);
-    } //~ ERROR: cannot be represented in target type `u32`
+        float_to_int_unchecked::<f32, u32>(-f32::NAN); //~ ERROR: cannot be represented in target type `u32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_neg.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, u32>(-1.000000001f32);
-    } //~ ERROR: cannot be represented in target type `u32`
+        float_to_int_unchecked::<f32, u32>(-1.000000001f32); //~ ERROR: cannot be represented in target type `u32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_too_big1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, i32>(2147483648.0f32);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f32, i32>(2147483648.0f32); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_too_big2.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, u32>((u32::MAX - 127) as f32);
-    } //~ ERROR: cannot be represented in target type `u32`
+        float_to_int_unchecked::<f32, u32>((u32::MAX - 127) as f32); //~ ERROR: cannot be represented in target type `u32`
+    }
 }

tests/fail/intrinsics/float_to_int_32_too_small1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f32, i32>(-2147483904.0f32);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f32, i32>(-2147483904.0f32); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_64_inf1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u128>(f64::INFINITY);
-    } //~ ERROR: cannot be represented in target type `u128`
+        float_to_int_unchecked::<f64, u128>(f64::INFINITY); //~ ERROR: cannot be represented in target type `u128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_infneg1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u128>(f64::NEG_INFINITY);
-    } //~ ERROR: cannot be represented in target type `u128`
+        float_to_int_unchecked::<f64, u128>(f64::NEG_INFINITY); //~ ERROR: cannot be represented in target type `u128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_infneg2.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i128>(f64::NEG_INFINITY);
-    } //~ ERROR: cannot be represented in target type `i128`
+        float_to_int_unchecked::<f64, i128>(f64::NEG_INFINITY); //~ ERROR: cannot be represented in target type `i128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_nan.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u32>(f64::NAN);
-    } //~ ERROR: cannot be represented in target type `u32`
+        float_to_int_unchecked::<f64, u32>(f64::NAN); //~ ERROR: cannot be represented in target type `u32`
+    }
 }

tests/fail/intrinsics/float_to_int_64_neg.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u128>(-1.0000000000001f64);
-    } //~ ERROR: cannot be represented in target type `u128`
+        float_to_int_unchecked::<f64, u128>(-1.0000000000001f64); //~ ERROR: cannot be represented in target type `u128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_big1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i32>(2147483648.0f64);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f64, i32>(2147483648.0f64); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_big2.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i64>(9223372036854775808.0f64);
-    } //~ ERROR: cannot be represented in target type `i64`
+        float_to_int_unchecked::<f64, i64>(9223372036854775808.0f64); //~ ERROR: cannot be represented in target type `i64`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_big3.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u64>(18446744073709551616.0f64);
-    } //~ ERROR: cannot be represented in target type `u64`
+        float_to_int_unchecked::<f64, u64>(18446744073709551616.0f64); //~ ERROR: cannot be represented in target type `u64`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_big4.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, u128>(u128::MAX as f64);
-    } //~ ERROR: cannot be represented in target type `u128`
+        float_to_int_unchecked::<f64, u128>(u128::MAX as f64); //~ ERROR: cannot be represented in target type `u128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_big5.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i128>(240282366920938463463374607431768211455.0f64);
-    } //~ ERROR: cannot be represented in target type `i128`
+        float_to_int_unchecked::<f64, i128>(240282366920938463463374607431768211455.0f64); //~ ERROR: cannot be represented in target type `i128`
+    }
 }

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, u128>(f64::MAX);
-    } //~ ERROR: cannot be represented in target type `u128`
+        float_to_int_unchecked::<f64, u128>(f64::MAX); //~ ERROR: cannot be represented in target type `u128`
+    }
 }

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, i128>(f64::MIN);
-    } //~ ERROR: cannot be represented in target type `i128`
+        float_to_int_unchecked::<f64, i128>(f64::MIN); //~ ERROR: cannot be represented in target type `i128`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_small1.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i32>(-2147483649.0f64);
-    } //~ ERROR: cannot be represented in target type `i32`
+        float_to_int_unchecked::<f64, i32>(-2147483649.0f64); //~ ERROR: cannot be represented in target type `i32`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_small2.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i64>(-9223372036854777856.0f64);
-    } //~ ERROR: cannot be represented in target type `i64`
+        float_to_int_unchecked::<f64, i64>(-9223372036854777856.0f64); //~ ERROR: cannot be represented in target type `i64`
+    }
 }

tests/fail/intrinsics/float_to_int_64_too_small3.rs

@@ -7,6 +7,6 @@ extern "rust-intrinsic" {
 
 fn main() {
     unsafe {
-        float_to_int_unchecked::<f64, i128>(-240282366920938463463374607431768211455.0f64);
-    } //~ ERROR: cannot be represented in target type `i128`
+        float_to_int_unchecked::<f64, i128>(-240282366920938463463374607431768211455.0f64); //~ ERROR: cannot be represented in target type `i128`
+    }
 }

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`
+    }
 }

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`
+    }
 }

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)
+    }
 }

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`
+    }
 }

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`
+    }
 }

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`
+    }
 }

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`
+    }
 }

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
+    }
 }

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
 }

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;
 }

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;
 }

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;
 }

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;
     }

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
+    }
 }

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
+    }
 }

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
+    }
 }

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);
 }

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

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
+    }
 }

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
+    }
 }