diff options
| author | bors <bors@rust-lang.org> | 2014-11-13 06:12:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-13 06:12:10 +0000 |
| commit | e2cd4765fb51551ecdbbb59365b9e0b70eecd576 (patch) | |
| tree | 1cfafb3e46c21f4bd9d765126daa048407180cc2 /src/libstd | |
| parent | 6a62ad3e2998d516fea15ddf37d4bfcc9846f9b2 (diff) | |
| parent | 837dd14de31bd4adc92d962559047e7b449c20a6 (diff) | |
| download | rust-e2cd4765fb51551ecdbbb59365b9e0b70eecd576.tar.gz rust-e2cd4765fb51551ecdbbb59365b9e0b70eecd576.zip | |
auto merge of #18867 : michaelsproul/rust/unreachable-formatting, r=pcwalton
Closes #18842.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index d82147947de..0c91542e5eb 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -211,7 +211,15 @@ macro_rules! debug_assert_eq( /// ``` #[macro_export] macro_rules! unreachable( - () => (panic!("internal error: entered unreachable code")) + () => ({ + panic!("internal error: entered unreachable code") + }); + ($msg:expr) => ({ + unreachable!("{}", $msg) + }); + ($fmt:expr, $($arg:tt)*) => ({ + panic!(concat!("internal error: entered unreachable code: ", $fmt), $($arg)*) + }); ) /// A standardised placeholder for marking unfinished code. It panics with the |