Skip to content

Commit bafbac4

Browse files
author
Kagamihime
committed
rustfmt libarena/lib.rs
1 parent 1a7a5b5 commit bafbac4

File tree

1 file changed

+24
-13
lines changed

1 file changed

+24
-13
lines changed

src/libarena/lib.rs

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323
html_root_url = "https://doc.rust-lang.org/nightly/",
2424
test(no_crate_inject, attr(deny(warnings))))]
2525
#![deny(warnings)]
26-
2726
#![feature(alloc)]
2827
#![feature(core_intrinsics)]
2928
#![feature(dropck_eyepatch)]
3029
#![feature(generic_param_attrs)]
3130
#![cfg_attr(test, feature(test))]
32-
3331
#![allow(deprecated)]
3432

3533
extern crate alloc;
@@ -69,7 +67,9 @@ struct TypedArenaChunk<T> {
6967
impl<T> TypedArenaChunk<T> {
7068
#[inline]
7169
unsafe fn new(capacity: usize) -> TypedArenaChunk<T> {
72-
TypedArenaChunk { storage: RawVec::with_capacity(capacity) }
70+
TypedArenaChunk {
71+
storage: RawVec::with_capacity(capacity),
72+
}
7373
}
7474

7575
/// Destroys this arena chunk.
@@ -132,7 +132,9 @@ impl<T> TypedArena<T> {
132132

133133
unsafe {
134134
if mem::size_of::<T>() == 0 {
135-
self.ptr.set(intrinsics::arith_offset(self.ptr.get() as *mut u8, 1) as *mut T);
135+
self.ptr
136+
.set(intrinsics::arith_offset(self.ptr.get() as *mut u8, 1)
137+
as *mut T);
136138
let ptr = mem::align_of::<T>() as *mut T;
137139
// Don't drop the object. This `write` is equivalent to `forget`.
138140
ptr::write(ptr, object);
@@ -156,7 +158,9 @@ impl<T> TypedArena<T> {
156158
/// - Zero-length slices
157159
#[inline]
158160
pub fn alloc_slice(&self, slice: &[T]) -> &mut [T]
159-
where T: Copy {
161+
where
162+
T: Copy,
163+
{
160164
assert!(mem::size_of::<T>() != 0);
161165
assert!(slice.len() != 0);
162166

@@ -320,7 +324,10 @@ impl DroplessArena {
320324
let (chunk, mut new_capacity);
321325
if let Some(last_chunk) = chunks.last_mut() {
322326
let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
323-
if last_chunk.storage.reserve_in_place(used_bytes, needed_bytes) {
327+
if last_chunk
328+
.storage
329+
.reserve_in_place(used_bytes, needed_bytes)
330+
{
324331
self.end.set(last_chunk.end());
325332
return;
326333
} else {
@@ -356,9 +363,9 @@ impl DroplessArena {
356363

357364
let ptr = self.ptr.get();
358365
// Set the pointer past ourselves
359-
self.ptr.set(intrinsics::arith_offset(
360-
self.ptr.get(), mem::size_of::<T>() as isize
361-
) as *mut u8);
366+
self.ptr.set(
367+
intrinsics::arith_offset(self.ptr.get(), mem::size_of::<T>() as isize) as *mut u8,
368+
);
362369
// Write into uninitialized memory.
363370
ptr::write(ptr as *mut T, object);
364371
&mut *(ptr as *mut T)
@@ -373,7 +380,9 @@ impl DroplessArena {
373380
/// - Zero-length slices
374381
#[inline]
375382
pub fn alloc_slice<T>(&self, slice: &[T]) -> &mut [T]
376-
where T: Copy {
383+
where
384+
T: Copy,
385+
{
377386
assert!(!mem::needs_drop::<T>());
378387
assert!(mem::size_of::<T>() != 0);
379388
assert!(slice.len() != 0);
@@ -389,7 +398,8 @@ impl DroplessArena {
389398
unsafe {
390399
let arena_slice = slice::from_raw_parts_mut(self.ptr.get() as *mut T, slice.len());
391400
self.ptr.set(intrinsics::arith_offset(
392-
self.ptr.get(), (slice.len() * mem::size_of::<T>()) as isize
401+
self.ptr.get(),
402+
(slice.len() * mem::size_of::<T>()) as isize,
393403
) as *mut u8);
394404
arena_slice.copy_from_slice(slice);
395405
arena_slice
@@ -454,8 +464,9 @@ mod tests {
454464

455465
let arena = Wrap(TypedArena::new());
456466

457-
let result =
458-
arena.alloc_outer(|| Outer { inner: arena.alloc_inner(|| Inner { value: 10 }) });
467+
let result = arena.alloc_outer(|| Outer {
468+
inner: arena.alloc_inner(|| Inner { value: 10 }),
469+
});
459470

460471
assert_eq!(result.inner.value, 10);
461472
}

0 commit comments

Comments
 (0)