diff options
| author | Ronald Kinard <[email protected]> | 2017-07-25 13:57:22 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-07-25 13:57:22 -0500 |
| commit | 23e9e4ef98113beb1d6c87746ceb0cb706ac725d (patch) | |
| tree | e3ead60984004eec0d3878c9240075b1ee51b2cf /ctr-std/src/macros.rs | |
| parent | Merge pull request #35 from panicbit/travis_ci (diff) | |
| parent | Enable old panic behavior for Citra (diff) | |
| download | archived-ctru-rs-23e9e4ef98113beb1d6c87746ceb0cb706ac725d.tar.xz archived-ctru-rs-23e9e4ef98113beb1d6c87746ceb0cb706ac725d.zip | |
Merge pull request #36 from FenrirWolf/errDisp
Display panics via the Error applet
Diffstat (limited to 'ctr-std/src/macros.rs')
| -rw-r--r-- | ctr-std/src/macros.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ctr-std/src/macros.rs b/ctr-std/src/macros.rs index 0ce6b0a..21a7da9 100644 --- a/ctr-std/src/macros.rs +++ b/ctr-std/src/macros.rs @@ -43,8 +43,8 @@ macro_rules! panic { ($msg:expr) => ({ $crate::rt::begin_panic($msg, { // static requires less code at runtime, more constant data - static _FILE_LINE: (&'static str, u32) = (file!(), line!()); - &_FILE_LINE + static _FILE_LINE_COL: (&'static str, u32, u32) = (file!(), line!(), column!()); + &_FILE_LINE_COL }) }); ($fmt:expr, $($arg:tt)+) => ({ @@ -53,8 +53,8 @@ macro_rules! panic { // used inside a dead function. Just `#[allow(dead_code)]` is // insufficient, since the user may have // `#[forbid(dead_code)]` and which cannot be overridden. - static _FILE_LINE: (&'static str, u32) = (file!(), line!()); - &_FILE_LINE + static _FILE_LINE_COL: (&'static str, u32, u32) = (file!(), line!(), column!()); + &_FILE_LINE_COL }) }); } |