Skip to content

Commit 50889e7

Browse files
committed
rustfmt
1 parent 3238846 commit 50889e7

File tree

1 file changed

+14
-24
lines changed
  • library/core/src/intrinsics

1 file changed

+14
-24
lines changed

library/core/src/intrinsics/mod.rs

+14-24
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
)]
6565
#![allow(missing_docs)]
6666

67-
use crate::marker::{DiscriminantKind, Tuple};
68-
use crate::mem::SizedTypeProperties;
69-
use crate::{ptr, ub_checks};
7067
use safety::{ensures, requires};
7168

7269
#[cfg(kani)]
7370
use crate::kani;
71+
use crate::marker::{DiscriminantKind, Tuple};
72+
use crate::mem::SizedTypeProperties;
73+
use crate::{ptr, ub_checks};
7474

7575
pub mod fallback;
7676
pub mod mir;
@@ -4944,6 +4944,7 @@ pub(crate) const fn miri_promise_symbolic_alignment(ptr: *const (), align: usize
49444944
#[unstable(feature = "kani", issue = "none")]
49454945
mod verify {
49464946
use core::mem::MaybeUninit;
4947+
49474948
use kani::{AllocationStatus, Arbitrary, ArbitraryPointer, PointerGenerator};
49484949

49494950
use super::*;
@@ -4978,7 +4979,7 @@ mod verify {
49784979
// `copy_nonoverlapping`.
49794980
// Kani contract checking would fail due to existing restriction on calls to
49804981
// the function under verification.
4981-
let gen_any_ptr = |buf: &mut [MaybeUninit<char>; 100]| -> *mut char {
4982+
let gen_any_ptr = |buf: &mut [MaybeUninit<char>; 100]| -> *mut char {
49824983
let base = buf.as_mut_ptr() as *mut u8;
49834984
base.wrapping_add(kani::any_where(|offset: &usize| *offset < 400)) as *mut char
49844985
};
@@ -4993,13 +4994,13 @@ mod verify {
49934994
let dst = if kani::any() { gen_any_ptr(&mut buffer2) } else { gen_any_ptr(&mut buffer1) };
49944995
unsafe { copy_nonoverlapping(src, dst, kani::any()) }
49954996
}
4996-
4997-
//We need this wrapper because transmute_unchecked is an intrinsic, for which Kani does
4997+
4998+
//We need this wrapper because transmute_unchecked is an intrinsic, for which Kani does
49984999
//not currently support contracts (https://github.com/model-checking/kani/issues/3345)
49995000
#[requires(crate::mem::size_of::<T>() == crate::mem::size_of::<U>())] //T and U have same size (transmute_unchecked does not guarantee this)
50005001
#[requires(ub_checks::can_dereference(&input as *const T as *const U))] //output can be deref'd as value of type U
50015002
#[allow(dead_code)]
5002-
unsafe fn transmute_unchecked_wrapper<T,U>(input: T) -> U {
5003+
unsafe fn transmute_unchecked_wrapper<T, U>(input: T) -> U {
50035004
unsafe { transmute_unchecked(input) }
50045005
}
50055006

@@ -5055,7 +5056,7 @@ mod verify {
50555056
//tests that transmute works correctly when transmuting something with zero size
50565057
#[kani::proof_for_contract(transmute_unchecked_wrapper)]
50575058
fn transmute_zero_size() {
5058-
let empty_arr: [u8;0] = [];
5059+
let empty_arr: [u8; 0] = [];
50595060
let unit_val: () = unsafe { transmute_unchecked_wrapper(empty_arr) };
50605061
assert!(unit_val == ());
50615062
}
@@ -5073,7 +5074,7 @@ mod verify {
50735074
let src: $src = kani::any();
50745075
let dst: $dst = unsafe { transmute_unchecked_wrapper(src) };
50755076
let src2: $src = unsafe { transmute_unchecked_wrapper(dst) };
5076-
assert_eq!(src,src2);
5077+
assert_eq!(src, src2);
50775078
}
50785079
};
50795080
}
@@ -5101,28 +5102,17 @@ mod verify {
51015102
#[kani::proof_for_contract(write_bytes)]
51025103
fn check_write_bytes() {
51035104
let mut generator = PointerGenerator::<100>::new();
5104-
let ArbitraryPointer {
5105-
ptr,
5106-
status,
5107-
..
5108-
} = generator.any_alloc_status::<char>();
5105+
let ArbitraryPointer { ptr, status, .. } = generator.any_alloc_status::<char>();
51095106
kani::assume(supported_status(status));
51105107
unsafe { write_bytes(ptr, kani::any(), kani::any()) };
51115108
}
51125109

51135110
fn run_with_arbitrary_ptrs<T: Arbitrary>(harness: impl Fn(*mut T, *mut T)) {
51145111
let mut generator1 = PointerGenerator::<100>::new();
51155112
let mut generator2 = PointerGenerator::<100>::new();
5116-
let ArbitraryPointer {
5117-
ptr: src,
5118-
status: src_status,
5119-
..
5120-
} = generator1.any_alloc_status::<T>();
5121-
let ArbitraryPointer {
5122-
ptr: dst,
5123-
status: dst_status,
5124-
..
5125-
} = if kani::any() {
5113+
let ArbitraryPointer { ptr: src, status: src_status, .. } =
5114+
generator1.any_alloc_status::<T>();
5115+
let ArbitraryPointer { ptr: dst, status: dst_status, .. } = if kani::any() {
51265116
generator1.any_alloc_status::<T>()
51275117
} else {
51285118
generator2.any_alloc_status::<T>()

0 commit comments

Comments
 (0)