bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Alloc docs teaks

Browse source
This commit is contained in:
Simon Sapin 2018-06-01 02:19:36 +02:00
parent b2d526cc8c
commit 9dcb64f346
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcore/alloc.rs
View file

@ -364,7 +364,6 @@ impl fmt::Display for AllocErr {
/// The `CannotReallocInPlace` error is used when `grow_in_place` or /// The `CannotReallocInPlace` error is used when `grow_in_place` or
/// `shrink_in_place` were unable to reuse the given memory block for /// `shrink_in_place` were unable to reuse the given memory block for
/// a requested layout. /// a requested layout.
// FIXME: should this be in libcore or liballoc?
#[unstable(feature = "allocator_api", issue = "32838")] #[unstable(feature = "allocator_api", issue = "32838")]
#[derive(Clone, PartialEq, Eq, Debug)] #[derive(Clone, PartialEq, Eq, Debug)]
pub struct CannotReallocInPlace; pub struct CannotReallocInPlace;
@ -456,10 +455,6 @@ impl From<LayoutErr> for CollectionAllocErr {
/// The `GlobalAlloc` trait is an `unsafe` trait for a number of reasons, and /// The `GlobalAlloc` trait is an `unsafe` trait for a number of reasons, and
/// implementors must ensure that they adhere to these contracts: /// implementors must ensure that they adhere to these contracts:
/// ///
/// * Pointers returned from allocation functions must point to valid memory and
/// retain their validity until at least the instance of `GlobalAlloc` is dropped
/// itself.
///
/// * It's undefined behavior if global allocators unwind. This restriction may /// * It's undefined behavior if global allocators unwind. This restriction may
/// be lifted in the future, but currently a panic from any of these /// be lifted in the future, but currently a panic from any of these
/// functions may lead to memory unsafety. /// functions may lead to memory unsafety.