Skip to content

Commit cc4a990

Browse files
committed
fmt
1 parent e5576a1 commit cc4a990

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/alloc_addresses/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
564564
opt_so_far = Some(so_far);
565565
} else {
566566
// When there's a jump, push what we have so far and start anew
567-
into.push((so_far.start as usize + p)..(so_far.end as usize + p));
567+
into.push(
568+
(so_far.start as usize + p)..(so_far.end as usize + p),
569+
);
568570
opt_so_far = Some(bit..bit + 1);
569571
},
570572
// 1st time we obviously need to insert it

src/shims/trace/parent.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,7 @@ pub fn sv_loop(
275275
// end_ffi was called by the child
276276
ExecEvent::End => {
277277
// Hand over the access info we traced
278-
event_tx
279-
.send(MemEvents { acc_events, alloc_cutoff: page_size })
280-
.unwrap();
278+
event_tx.send(MemEvents { acc_events, alloc_cutoff: page_size }).unwrap();
281279
// And reset our values
282280
acc_events = Vec::new();
283281
ch_stack = None;
@@ -723,12 +721,7 @@ pub unsafe extern "C" fn mempr_on() {
723721
let len = PAGE_SIZE.load(Ordering::Relaxed).wrapping_mul(PAGE_COUNT.load(Ordering::Relaxed));
724722
// SAFETY: Upheld by caller
725723
unsafe {
726-
if libc::mprotect(
727-
PAGE_ADDR.load(Ordering::Relaxed).cast(),
728-
len,
729-
libc::PROT_NONE,
730-
) != 0
731-
{
724+
if libc::mprotect(PAGE_ADDR.load(Ordering::Relaxed).cast(), len, libc::PROT_NONE) != 0 {
732725
std::process::exit(-1);
733726
}
734727
}

0 commit comments

Comments
 (0)