From 9dcb64f34638e8f72fa0ff54b39dfd071d0f8f86 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 1 Jun 2018 02:19:36 +0200 Subject: [PATCH] Alloc docs teaks --- src/libcore/alloc.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs index 9c324cdb4ed..b0ac43e50f5 100644 --- a/src/libcore/alloc.rs +++ b/src/libcore/alloc.rs @@ -364,7 +364,6 @@ impl fmt::Display for AllocErr { /// The `CannotReallocInPlace` error is used when `grow_in_place` or /// `shrink_in_place` were unable to reuse the given memory block for /// a requested layout. -// FIXME: should this be in libcore or liballoc? #[unstable(feature = "allocator_api", issue = "32838")] #[derive(Clone, PartialEq, Eq, Debug)] pub struct CannotReallocInPlace; @@ -456,10 +455,6 @@ impl From for CollectionAllocErr { /// The `GlobalAlloc` trait is an `unsafe` trait for a number of reasons, and /// 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 /// be lifted in the future, but currently a panic from any of these /// functions may lead to memory unsafety.