about summary refs log tree commit diff
path: root/src/libcore/alloc.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-06-01 02:19:36 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-06-11 13:48:57 -0700
commit9dcb64f34638e8f72fa0ff54b39dfd071d0f8f86 (patch)
treef9df4eeacc29bb36d71b21f97eeda3f3d4a5465e /src/libcore/alloc.rs
parentb2d526cc8ccae720713ee15c1c2878dc5c7e94f5 (diff)
downloadrust-9dcb64f34638e8f72fa0ff54b39dfd071d0f8f86.tar.gz
rust-9dcb64f34638e8f72fa0ff54b39dfd071d0f8f86.zip
Alloc docs teaks
Diffstat (limited to 'src/libcore/alloc.rs')
-rw-r--r--src/libcore/alloc.rs5
1 files changed, 0 insertions, 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<LayoutErr> 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.