Rollup merge of #49082 - SimonSapin:mu, r=alexcrichton

Remove deprecated unstable alloc::heap::EMPTY constant
This commit is contained in:
kennytm 2018-03-17 17:20:48 +08:00 committed by GitHub
commit 7638c9fd84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -228,14 +228,6 @@ unsafe impl Alloc for Heap {
}
}
/// An arbitrary non-null address to represent zero-size allocations.
///
/// This preserves the non-null invariant for types like `Box<T>`. The address
/// may overlap with non-zero-size memory allocations.
#[rustc_deprecated(since = "1.19.0", reason = "Use Unique/NonNull::empty() instead")]
#[unstable(feature = "heap_api", issue = "27700")]
pub const EMPTY: *mut () = 1 as *mut ();
/// The allocator for unique pointers.
// This function must not unwind. If it does, MIR trans will fail.
#[cfg(not(test))]