diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-07-25 15:57:15 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-25 15:57:15 -0700 |
| commit | 53f0eae3866f5b4708e9f34b009df843f91136d7 (patch) | |
| tree | 339e9e398561ec6a382118ad365b4ecbe3579ea7 /src/libstd/rt | |
| parent | cf7a89f0c0935412f24d64c0ae2e202970124ff9 (diff) | |
| download | rust-53f0eae3866f5b4708e9f34b009df843f91136d7.tar.gz rust-53f0eae3866f5b4708e9f34b009df843f91136d7.zip | |
Revert "Use fewer instructions for `fail!`"
This reverts commit c61f9763e2e03afbe62445877ceb3ed15e22e123. Conflicts: src/librustrt/unwind.rs src/libstd/macros.rs
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
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) |