Skip to content

Commit 92f7763

Browse files
author
The Miri Cronjob Bot
committed
fmt
1 parent b8ee38d commit 92f7763

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

src/tools/miri/src/shims/alloc.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
8181
fn malloc(&mut self, size: u64, init: AllocInit) -> InterpResult<'tcx, Pointer> {
8282
let this = self.eval_context_mut();
8383
let align = this.malloc_align(size);
84-
let ptr = this.allocate_ptr(Size::from_bytes(size), align, MiriMemoryKind::C.into(), init)?;
84+
let ptr =
85+
this.allocate_ptr(Size::from_bytes(size), align, MiriMemoryKind::C.into(), init)?;
8586
interp_ok(ptr.into())
8687
}
8788

@@ -105,7 +106,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
105106
Size::from_bytes(size),
106107
Align::from_bytes(align).unwrap(),
107108
MiriMemoryKind::C.into(),
108-
AllocInit::Uninit
109+
AllocInit::Uninit,
109110
)?;
110111
this.write_pointer(ptr, &memptr)?;
111112
interp_ok(Scalar::from_i32(0))
@@ -138,7 +139,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
138139
Size::from_bytes(new_size),
139140
new_align,
140141
MiriMemoryKind::C.into(),
141-
AllocInit::Uninit
142+
AllocInit::Uninit,
142143
)?;
143144
interp_ok(new_ptr.into())
144145
}
@@ -179,7 +180,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
179180
Size::from_bytes(size),
180181
Align::from_bytes(align).unwrap(),
181182
MiriMemoryKind::C.into(),
182-
AllocInit::Uninit
183+
AllocInit::Uninit,
183184
)?;
184185
interp_ok(ptr.into())
185186
}

src/tools/miri/src/shims/foreign_items.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
509509
Size::from_bytes(size),
510510
Align::from_bytes(align).unwrap(),
511511
memory_kind.into(),
512-
AllocInit::Uninit
512+
AllocInit::Uninit,
513513
)?;
514514

515515
ecx.write_pointer(ptr, dest)
@@ -538,7 +538,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
538538
Size::from_bytes(size),
539539
Align::from_bytes(align).unwrap(),
540540
MiriMemoryKind::Rust.into(),
541-
AllocInit::Zero
541+
AllocInit::Zero,
542542
)?;
543543
this.write_pointer(ptr, dest)
544544
});
@@ -599,7 +599,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
599599
Size::from_bytes(new_size),
600600
align,
601601
MiriMemoryKind::Rust.into(),
602-
AllocInit::Uninit
602+
AllocInit::Uninit,
603603
)?;
604604
this.write_pointer(new_ptr, dest)
605605
});

src/tools/miri/src/shims/unix/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
11121112
Size::from_bytes(size),
11131113
dirent_layout.align.abi,
11141114
MiriMemoryKind::Runtime.into(),
1115-
AllocInit::Uninit
1115+
AllocInit::Uninit,
11161116
)?;
11171117
let entry: Pointer = entry.into();
11181118

src/tools/miri/src/shims/unix/linux/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
4949
Size::from_bytes(new_size),
5050
align,
5151
MiriMemoryKind::Mmap.into(),
52-
AllocInit::Zero
52+
AllocInit::Zero,
5353
)?;
5454

5555
interp_ok(Scalar::from_pointer(ptr, this))

src/tools/miri/src/shims/unix/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
116116
align,
117117
MiriMemoryKind::Mmap.into(),
118118
// mmap guarantees new mappings are zero-init.
119-
AllocInit::Zero
119+
AllocInit::Zero,
120120
)?;
121121

122122
interp_ok(Scalar::from_pointer(ptr, this))

src/tools/miri/src/shims/windows/foreign_items.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
266266
Size::from_bytes(size),
267267
Align::from_bytes(align).unwrap(),
268268
MiriMemoryKind::WinHeap.into(),
269-
init
269+
init,
270270
)?;
271271
this.write_pointer(ptr, dest)?;
272272
}
@@ -299,7 +299,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
299299
Size::from_bytes(size),
300300
Align::from_bytes(align).unwrap(),
301301
MiriMemoryKind::WinHeap.into(),
302-
AllocInit::Uninit
302+
AllocInit::Uninit,
303303
)?;
304304
this.write_pointer(new_ptr, dest)?;
305305
}

0 commit comments

Comments
 (0)