diff options
| author | bors <bors@rust-lang.org> | 2015-06-27 14:53:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-27 14:53:15 +0000 |
| commit | 2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb (patch) | |
| tree | c64523a6c190e5bc6399baf2dbef3f6048af1c07 /src/libstd | |
| parent | b36ae019468c36c995523d797446a372ab9d14e1 (diff) | |
| parent | 6dd33b459b30b65a75f644a75169cb6a07e4df53 (diff) | |
| download | rust-2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb.tar.gz rust-2ba46f8bbc6fdf10e434faea52b9ca20e0d9f2eb.zip | |
Auto merge of #26616 - Manishearth:rollup, r=Manishearth
- Successful merges: #26565, #26584, #26596, #26603 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 02c35e9526d..697b934c676 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -36,28 +36,6 @@ #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] #[allow_internal_unstable] -/// The entry point for panic of Rust threads. -/// -/// This macro is used to inject panic into a Rust thread, causing the thread to -/// unwind and panic entirely. Each thread's panic can be reaped as the -/// `Box<Any>` type, and the single-argument form of the `panic!` macro will be -/// the value which is transmitted. -/// -/// The multi-argument form of this macro panics with a string and has the -/// `format!` syntax for building a string. -/// -/// # Examples -/// -/// ```should_panic -/// # #![allow(unreachable_code)] -/// panic!(); -/// panic!("this is a terrible mistake!"); -/// panic!(4); // panic with the value of 4 to be collected elsewhere -/// panic!("this is a {} {message}", "fancy", message = "message"); -/// ``` -#[macro_export] -#[stable(feature = "rust1", since = "1.0.0")] -#[allow_internal_unstable] macro_rules! panic { () => ({ panic!("explicit panic") |
