Skip to content

Run rustfmt on liballoc. #28987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/liballoc/arc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,7 @@ impl<T: ?Sized> Arc<T> {

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))
}
}
}
Expand Down Expand Up @@ -722,11 +720,7 @@ impl<T: ?Sized> Drop for Weak<T> {
// 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)) }
}
}
}
Expand Down Expand Up @@ -1152,5 +1146,7 @@ impl<T: ?Sized> borrow::Borrow<T> for Arc<T> {

#[stable(since = "1.5.0", feature = "smart_ptr_as_ref")]
impl<T: ?Sized> AsRef<T> for Arc<T> {
fn as_ref(&self) -> &T { &**self }
fn as_ref(&self) -> &T {
&**self
}
}
20 changes: 16 additions & 4 deletions src/liballoc/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ fn make_place<T>() -> IntermediateBox<T> {
p
};

IntermediateBox { ptr: p, size: size, align: align, marker: marker::PhantomData }
IntermediateBox {
ptr: p,
size: size,
align: align,
marker: marker::PhantomData,
}
}

impl<T> BoxPlace<T> for IntermediateBox<T> {
Expand Down Expand Up @@ -538,7 +543,10 @@ impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
#[stable(feature = "box_slice_clone", since = "1.3.0")]
impl<T: Clone> 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();

Expand Down Expand Up @@ -597,10 +605,14 @@ impl<T: ?Sized> borrow::BorrowMut<T> for Box<T> {

#[stable(since = "1.5.0", feature = "smart_ptr_as_ref")]
impl<T: ?Sized> AsRef<T> for Box<T> {
fn as_ref(&self) -> &T { &**self }
fn as_ref(&self) -> &T {
&**self
}
}

#[stable(since = "1.5.0", feature = "smart_ptr_as_ref")]
impl<T: ?Sized> AsMut<T> for Box<T> {
fn as_mut(&mut self) -> &mut T { &mut **self }
fn as_mut(&mut self) -> &mut T {
&mut **self
}
}
18 changes: 13 additions & 5 deletions src/liballoc/raw_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ impl<T> RawVec<T> {
};

// 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,
}
}
}

Expand Down Expand Up @@ -102,7 +105,10 @@ impl<T> RawVec<T> {
ptr
};

RawVec { ptr: Unique::new(ptr as *mut _), cap: cap }
RawVec {
ptr: Unique::new(ptr as *mut _),
cap: cap,
}
}
}

Expand All @@ -114,7 +120,10 @@ impl<T> RawVec<T> {
/// 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<T>`.
Expand Down Expand Up @@ -398,8 +407,7 @@ impl<T> RawVec<T> {
}

// 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());
Expand Down
12 changes: 5 additions & 7 deletions src/liballoc/rc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,7 @@ impl<T: ?Sized> Drop for Rc<T> {
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))
}
}
}
Expand Down Expand Up @@ -788,9 +786,7 @@ impl<T: ?Sized> Drop for Weak<T> {
// 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))
}
}
}
Expand Down Expand Up @@ -1121,5 +1117,7 @@ impl<T: ?Sized> borrow::Borrow<T> for Rc<T> {

#[stable(since = "1.5.0", feature = "smart_ptr_as_ref")]
impl<T: ?Sized> AsRef<T> for Rc<T> {
fn as_ref(&self) -> &T { &**self }
fn as_ref(&self) -> &T {
&**self
}
}