diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 5 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index f3f47e3923d..f0732c7d508 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -39,11 +39,10 @@ #[macro_export] macro_rules! fail( () => ({ - // static requires less code at runtime, more constant data - static FILE_LINE: (&'static str, uint) = (file!(), line!()); - ::std::rt::begin_unwind_no_time_to_explain(&FILE_LINE) + fail!("explicit failure") }); ($msg:expr) => ({ + // static requires less code at runtime, more constant data static FILE_LINE: (&'static str, uint) = (file!(), line!()); let (file, line) = FILE_LINE; ::std::rt::begin_unwind($msg, file, line) diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 023a30de027..4490977bde6 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -66,8 +66,7 @@ pub use self::util::{default_sched_threads, min_stack, running_on_valgrind}; // standard library which work together to create the entire runtime. pub use alloc::{heap, libc_heap}; pub use rustrt::{task, local, mutex, exclusive, stack, args, rtio, thread}; -pub use rustrt::{Stdio, Stdout, Stderr}; -pub use rustrt::{begin_unwind, begin_unwind_fmt, begin_unwind_no_time_to_explain}; +pub use rustrt::{Stdio, Stdout, Stderr, begin_unwind, begin_unwind_fmt}; pub use rustrt::{bookkeeping, at_exit, unwind, DEFAULT_ERROR_CODE, Runtime}; // Simple backtrace functionality (to print on failure) |