about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-30 12:01:41 +0000
committerbors <bors@rust-lang.org>2015-07-30 12:01:41 +0000
commit5fcaf9567691c91eb48693ba9ec234703fd4e0d0 (patch)
treef28a612f46b7f99abb3c849c48d9ebdd3de9d7b8
parent87055a68c3194db212456f99ece080728a5fc2f8 (diff)
parentfc5b79ce86072e469c6b80d1be53ea58d6feec76 (diff)
downloadrust-5fcaf9567691c91eb48693ba9ec234703fd4e0d0.tar.gz
rust-5fcaf9567691c91eb48693ba9ec234703fd4e0d0.zip
Auto merge of #27385 - chris-morgan:core-panic-use-$crate, r=alexcrichton
I’ve been sitting on this one for ages now. Silly me, if only I had got on and submitted it earlier it’d be into the stable release by now…
-rw-r--r--src/libcore/macros.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs
index 14bb82dff7d..9f4d61a50d5 100644
--- a/src/libcore/macros.rs
+++ b/src/libcore/macros.rs
@@ -17,7 +17,7 @@ macro_rules! panic {
     );
     ($msg:expr) => ({
         static _MSG_FILE_LINE: (&'static str, &'static str, u32) = ($msg, file!(), line!());
-        ::core::panicking::panic(&_MSG_FILE_LINE)
+        $crate::panicking::panic(&_MSG_FILE_LINE)
     });
     ($fmt:expr, $($arg:tt)*) => ({
         // The leading _'s are to avoid dead code warnings if this is
@@ -25,7 +25,7 @@ macro_rules! panic {
         // insufficient, since the user may have
         // `#[forbid(dead_code)]` and which cannot be overridden.
         static _FILE_LINE: (&'static str, u32) = (file!(), line!());
-        ::core::panicking::panic_fmt(format_args!($fmt, $($arg)*), &_FILE_LINE)
+        $crate::panicking::panic_fmt(format_args!($fmt, $($arg)*), &_FILE_LINE)
     });
 }