Skip to content

Commit

Permalink
Rollup merge of rust-lang#66771 - SimonSapin:panic-stability, r=KodrAus
Browse files Browse the repository at this point in the history
Stabilize the `core::panic` module

`std::panic` is already stable.

`core::panic::PanicInfo` and `core::panic::Location` are stable and can be used through that path because of a bug in stability checking: rust-lang#15702
  • Loading branch information
Centril committed Dec 16, 2019
2 parents 1c12dc8 + eab1dc9 commit 6b9bb74
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/libcore/panic.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//! Panic support in the standard library.

#![unstable(feature = "core_panic_info",
reason = "newly available in libcore",
issue = "44489")]
#![stable(feature = "core_panic_info", since = "1.41.0")]

use crate::any::Any;
use crate::fmt;
Expand Down Expand Up @@ -39,10 +37,10 @@ pub struct PanicInfo<'a> {
}

impl<'a> PanicInfo<'a> {
#![unstable(feature = "panic_internals",
reason = "internal details of the implementation of the `panic!` \
and related macros",
issue = "0")]
#[unstable(feature = "panic_internals",
reason = "internal details of the implementation of the `panic!` \
and related macros",
issue = "0")]
#[doc(hidden)]
#[inline]
pub fn internal_constructor(
Expand All @@ -57,6 +55,10 @@ impl<'a> PanicInfo<'a> {
}
}

#[unstable(feature = "panic_internals",
reason = "internal details of the implementation of the `panic!` \
and related macros",
issue = "0")]
#[doc(hidden)]
#[inline]
pub fn set_payload(&mut self, info: &'a (dyn Any + Send)) {
Expand Down Expand Up @@ -90,7 +92,7 @@ impl<'a> PanicInfo<'a> {
/// returns that message ready to be used for example with [`fmt::write`]
///
/// [`fmt::write`]: ../fmt/fn.write.html
#[unstable(feature = "panic_info_message", issue = "44489")]
#[unstable(feature = "panic_info_message", issue = "66745")]
pub fn message(&self) -> Option<&fmt::Arguments<'_>> {
self.message
}
Expand Down

0 comments on commit 6b9bb74

Please sign in to comment.