Skip to content

Commit 30a3516

Browse files
authored
Rollup merge of rust-lang#47069 - Kagamihime:master, r=nrc
rustfmt libarena/lib.rs Note: it's my very first pull request. I'm trying to do something very simple to see how it works here, even if it's a tiny change or maybe it's not correct (sorry if it is the case). r? @nrc
2 parents 743b976 + b2d0d18 commit 30a3516

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

src/libarena/lib.rs

+24-11
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ struct TypedArenaChunk<T> {
6969
impl<T> TypedArenaChunk<T> {
7070
#[inline]
7171
unsafe fn new(capacity: usize) -> TypedArenaChunk<T> {
72-
TypedArenaChunk { storage: RawVec::with_capacity(capacity) }
72+
TypedArenaChunk {
73+
storage: RawVec::with_capacity(capacity),
74+
}
7375
}
7476

7577
/// Destroys this arena chunk.
@@ -132,7 +134,9 @@ impl<T> TypedArena<T> {
132134

133135
unsafe {
134136
if mem::size_of::<T>() == 0 {
135-
self.ptr.set(intrinsics::arith_offset(self.ptr.get() as *mut u8, 1) as *mut T);
137+
self.ptr
138+
.set(intrinsics::arith_offset(self.ptr.get() as *mut u8, 1)
139+
as *mut T);
136140
let ptr = mem::align_of::<T>() as *mut T;
137141
// Don't drop the object. This `write` is equivalent to `forget`.
138142
ptr::write(ptr, object);
@@ -157,7 +161,9 @@ impl<T> TypedArena<T> {
157161
/// - Zero-length slices
158162
#[inline]
159163
pub fn alloc_slice(&self, slice: &[T]) -> &mut [T]
160-
where T: Copy {
164+
where
165+
T: Copy,
166+
{
161167
assert!(mem::size_of::<T>() != 0);
162168
assert!(slice.len() != 0);
163169

@@ -321,7 +327,10 @@ impl DroplessArena {
321327
let (chunk, mut new_capacity);
322328
if let Some(last_chunk) = chunks.last_mut() {
323329
let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
324-
if last_chunk.storage.reserve_in_place(used_bytes, needed_bytes) {
330+
if last_chunk
331+
.storage
332+
.reserve_in_place(used_bytes, needed_bytes)
333+
{
325334
self.end.set(last_chunk.end());
326335
return;
327336
} else {
@@ -357,9 +366,9 @@ impl DroplessArena {
357366

358367
let ptr = self.ptr.get();
359368
// Set the pointer past ourselves
360-
self.ptr.set(intrinsics::arith_offset(
361-
self.ptr.get(), mem::size_of::<T>() as isize
362-
) as *mut u8);
369+
self.ptr.set(
370+
intrinsics::arith_offset(self.ptr.get(), mem::size_of::<T>() as isize) as *mut u8,
371+
);
363372
// Write into uninitialized memory.
364373
ptr::write(ptr as *mut T, object);
365374
&mut *(ptr as *mut T)
@@ -375,7 +384,9 @@ impl DroplessArena {
375384
/// - Zero-length slices
376385
#[inline]
377386
pub fn alloc_slice<T>(&self, slice: &[T]) -> &mut [T]
378-
where T: Copy {
387+
where
388+
T: Copy,
389+
{
379390
assert!(!mem::needs_drop::<T>());
380391
assert!(mem::size_of::<T>() != 0);
381392
assert!(slice.len() != 0);
@@ -391,7 +402,8 @@ impl DroplessArena {
391402
unsafe {
392403
let arena_slice = slice::from_raw_parts_mut(self.ptr.get() as *mut T, slice.len());
393404
self.ptr.set(intrinsics::arith_offset(
394-
self.ptr.get(), (slice.len() * mem::size_of::<T>()) as isize
405+
self.ptr.get(),
406+
(slice.len() * mem::size_of::<T>()) as isize,
395407
) as *mut u8);
396408
arena_slice.copy_from_slice(slice);
397409
arena_slice
@@ -456,8 +468,9 @@ mod tests {
456468

457469
let arena = Wrap(TypedArena::new());
458470

459-
let result =
460-
arena.alloc_outer(|| Outer { inner: arena.alloc_inner(|| Inner { value: 10 }) });
471+
let result = arena.alloc_outer(|| Outer {
472+
inner: arena.alloc_inner(|| Inner { value: 10 }),
473+
});
461474

462475
assert_eq!(result.inner.value, 10);
463476
}

0 commit comments

Comments
 (0)