Skip to content

Commit 9dcb64f

Browse files
committed
Alloc docs teaks
1 parent b2d526c commit 9dcb64f

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/libcore/alloc.rs

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

0 commit comments

Comments
 (0)