diff options
| author | bors <bors@rust-lang.org> | 2018-02-18 06:02:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-18 06:02:35 +0000 |
| commit | 1ad094d81c97b3d2dd8e980ccd1475a80647540d (patch) | |
| tree | 4ef130d008fe8e80a59a72d974eba196832a7fb4 /src/liballoc | |
| parent | e8f03b9438d6516fd7067cfda2f09c925d6d92f2 (diff) | |
| parent | 399dcd112725a35352075262863781b3355452cd (diff) | |
| download | rust-1ad094d81c97b3d2dd8e980ccd1475a80647540d.tar.gz rust-1ad094d81c97b3d2dd8e980ccd1475a80647540d.zip | |
Auto merge of #47687 - SimonSapin:panic-impl, r=sfackler
RFC 2070 part 1: PanicInfo and Location API changes This implements part of https://rust-lang.github.io/rfcs/2070-panic-implementation.html Tracking issue: https://github.com/rust-lang/rust/issues/44489 * Move `std::panic::PanicInfo` and `std::panic::Location` to a new `core::panic` module. The two types and the `std` module were already `#[stable]` and stay that way, the new `core` module is `#[unstable]`. * Add a new `PanicInfo::message(&self) -> Option<&fmt::Arguments>` method, which is `#[unstable]`. * Implement `Display` for `PanicInfo` and `Location`
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 37af9ea5295..372d606e457 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -232,7 +232,7 @@ unsafe impl Alloc for Heap { /// /// 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", reason = "Use Unique/NonNull::empty() instead")] +#[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 (); |