Skip to content

Commit

Permalink
Rollup merge of rust-lang#49082 - SimonSapin:mu, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove deprecated unstable alloc::heap::EMPTY constant
  • Loading branch information
kennytm committed Mar 17, 2018
2 parents f24e35c + f0ad533 commit 7638c9f
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/liballoc/heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))]
Expand Down

0 comments on commit 7638c9f

Please sign in to comment.