From 5dcd4061880b3ce9e97a7dc6638360540bf6d4f7 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Sun, 11 Oct 2015 22:11:59 -0700 Subject: [PATCH] Run rustfmt on liballoc. --- src/liballoc/arc.rs | 14 +++++--------- src/liballoc/boxed.rs | 20 ++++++++++++++++---- src/liballoc/raw_vec.rs | 18 +++++++++++++----- src/liballoc/rc.rs | 12 +++++------- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 36989c2daad..8c12b9d94ba 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -307,9 +307,7 @@ impl Arc { if self.inner().weak.fetch_sub(1, Release) == 1 { atomic::fence(Acquire); - deallocate(ptr as *mut u8, - size_of_val(&*ptr), - align_of_val(&*ptr)) + deallocate(ptr as *mut u8, size_of_val(&*ptr), align_of_val(&*ptr)) } } } @@ -722,11 +720,7 @@ impl Drop for Weak { // ref, which can only happen after the lock is released. if self.inner().weak.fetch_sub(1, Release) == 1 { atomic::fence(Acquire); - unsafe { - deallocate(ptr as *mut u8, - size_of_val(&*ptr), - align_of_val(&*ptr)) - } + unsafe { deallocate(ptr as *mut u8, size_of_val(&*ptr), align_of_val(&*ptr)) } } } } @@ -1152,5 +1146,7 @@ impl borrow::Borrow for Arc { #[stable(since = "1.5.0", feature = "smart_ptr_as_ref")] impl AsRef for Arc { - fn as_ref(&self) -> &T { &**self } + fn as_ref(&self) -> &T { + &**self + } } diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 629adf4649d..e85b7d2d496 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -161,7 +161,12 @@ fn make_place() -> IntermediateBox { p }; - IntermediateBox { ptr: p, size: size, align: align, marker: marker::PhantomData } + IntermediateBox { + ptr: p, + size: size, + align: align, + marker: marker::PhantomData, + } } impl BoxPlace for IntermediateBox { @@ -538,7 +543,10 @@ impl, U: ?Sized> CoerceUnsized> for Box {} #[stable(feature = "box_slice_clone", since = "1.3.0")] impl Clone for Box<[T]> { fn clone(&self) -> Self { - let mut new = BoxBuilder { data: RawVec::with_capacity(self.len()), len: 0 }; + let mut new = BoxBuilder { + data: RawVec::with_capacity(self.len()), + len: 0, + }; let mut target = new.data.ptr(); @@ -597,10 +605,14 @@ impl borrow::BorrowMut for Box { #[stable(since = "1.5.0", feature = "smart_ptr_as_ref")] impl AsRef for Box { - fn as_ref(&self) -> &T { &**self } + fn as_ref(&self) -> &T { + &**self + } } #[stable(since = "1.5.0", feature = "smart_ptr_as_ref")] impl AsMut for Box { - fn as_mut(&mut self) -> &mut T { &mut **self } + fn as_mut(&mut self) -> &mut T { + &mut **self + } } diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index 49d37698154..4df3bacdcb6 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -65,7 +65,10 @@ impl RawVec { }; // heap::EMPTY doubles as "unallocated" and "zero-sized allocation" - RawVec { ptr: Unique::new(heap::EMPTY as *mut T), cap: cap } + RawVec { + ptr: Unique::new(heap::EMPTY as *mut T), + cap: cap, + } } } @@ -102,7 +105,10 @@ impl RawVec { ptr }; - RawVec { ptr: Unique::new(ptr as *mut _), cap: cap } + RawVec { + ptr: Unique::new(ptr as *mut _), + cap: cap, + } } } @@ -114,7 +120,10 @@ impl RawVec { /// capacity cannot exceed `isize::MAX` (only a concern on 32-bit systems). /// If the ptr and capacity come from a RawVec, then this is guaranteed. pub unsafe fn from_raw_parts(ptr: *mut T, cap: usize) -> Self { - RawVec { ptr: Unique::new(ptr), cap: cap } + RawVec { + ptr: Unique::new(ptr), + cap: cap, + } } /// Converts a `Box<[T]>` into a `RawVec`. @@ -398,8 +407,7 @@ impl RawVec { } // This check is my waterloo; it's the only thing Vec wouldn't have to do. - assert!(self.cap >= amount, - "Tried to shrink to a larger capacity"); + assert!(self.cap >= amount, "Tried to shrink to a larger capacity"); if amount == 0 { mem::replace(self, RawVec::new()); diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 06d03161ca1..4753bb2379a 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -467,9 +467,7 @@ impl Drop for Rc { self.dec_weak(); if self.weak() == 0 { - deallocate(ptr as *mut u8, - size_of_val(&*ptr), - align_of_val(&*ptr)) + deallocate(ptr as *mut u8, size_of_val(&*ptr), align_of_val(&*ptr)) } } } @@ -788,9 +786,7 @@ impl Drop for Weak { // the weak count starts at 1, and will only go to zero if all // the strong pointers have disappeared. if self.weak() == 0 { - deallocate(ptr as *mut u8, - size_of_val(&*ptr), - align_of_val(&*ptr)) + deallocate(ptr as *mut u8, size_of_val(&*ptr), align_of_val(&*ptr)) } } } @@ -1121,5 +1117,7 @@ impl borrow::Borrow for Rc { #[stable(since = "1.5.0", feature = "smart_ptr_as_ref")] impl AsRef for Rc { - fn as_ref(&self) -> &T { &**self } + fn as_ref(&self) -> &T { + &**self + } }