mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #29020 - goyox86:goyox86/rustfmting-libarena, r=nrc

Browse Source 
Hi Rustaceans!

This is the result of running latest rustfmt on libarena!

//cc @nrc
This commit is contained in:
bors 2015-10-16 14:20:25 +00:00
commit 24228fee15
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libarena/lib.rs
View File

@ -245,7 +245,9 @@ fn alloc_copy_inner(&self, n_bytes: usize, align: usize) -> *const u8 {
}
#[inline]
fn alloc_copy<T, F>(&self, op: F) -> &mut T where F: FnOnce() -> T {
fn alloc_copy<T, F>(&self, op: F) -> &mut T
where F: FnOnce() -> T
{
unsafe {
let ptr = self.alloc_copy_inner(mem::size_of::<T>(), mem::align_of::<T>());
let ptr = ptr as *mut T;
@ -296,7 +298,9 @@ fn alloc_noncopy_inner(&self, n_bytes: usize, align: usize) -> (*const u8, *cons
}
#[inline]
fn alloc_noncopy<T, F>(&self, op: F) -> &mut T where F: FnOnce() -> T {
fn alloc_noncopy<T, F>(&self, op: F) -> &mut T
where F: FnOnce() -> T
{
unsafe {
let tydesc = get_tydesc::<T>();
let (ty_ptr, ptr) = self.alloc_noncopy_inner(mem::size_of::<T>(), mem::align_of::<T>());
@ -318,7 +322,9 @@ fn alloc_noncopy<T, F>(&self, op: F) -> &mut T where F: FnOnce() -> T {
/// Allocates a new item in the arena, using `op` to initialize the value,
/// and returns a reference to it.
#[inline]
pub fn alloc<T:'longer_than_self, F>(&self, op: F) -> &mut T where F: FnOnce() -> T {
pub fn alloc<T: 'longer_than_self, F>(&self, op: F) -> &mut T
where F: FnOnce() -> T
{
unsafe {
if intrinsics::needs_drop::<T>() {
self.alloc_noncopy(op)