mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use given allocator instad of Global

Browse source
This commit is contained in:
Aljoscha Meyer 2024-07-22 08:17:46 +02:00 • committed by GitHub
parent 497ef49805
commit 351fe27354
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/alloc/src/boxed.rs
View file

@ -867,7 +867,7 @@ impl<T, A: Allocator> Box<[T], A> {
Ok(l) => l, Ok(l) => l,
Err(_) => return Err(AllocError), Err(_) => return Err(AllocError),
}; };
Global.allocate(layout)?.cast() alloc.allocate(layout)?.cast()
}; };
unsafe { Ok(RawVec::from_raw_parts_in(ptr.as_ptr(), len, alloc).into_box(len)) } unsafe { Ok(RawVec::from_raw_parts_in(ptr.as_ptr(), len, alloc).into_box(len)) }
} }
@ -906,7 +906,7 @@ impl<T, A: Allocator> Box<[T], A> {
Ok(l) => l, Ok(l) => l,
Err(_) => return Err(AllocError), Err(_) => return Err(AllocError),
}; };
Global.allocate_zeroed(layout)?.cast() alloc.allocate_zeroed(layout)?.cast()
}; };
unsafe { Ok(RawVec::from_raw_parts_in(ptr.as_ptr(), len, alloc).into_box(len)) } unsafe { Ok(RawVec::from_raw_parts_in(ptr.as_ptr(), len, alloc).into_box(len)) }
} }