From 1e01f7f470f1d79be710d546ab25426fcede59f9 Mon Sep 17 00:00:00 2001 From: Kevin Yap Date: Fri, 13 Feb 2015 19:59:53 -0800 Subject: Rename std::failure to std::panicking Closes #22306. --- src/libstd/rt/unwind.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 659e787a9ff..464adadde62 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -62,7 +62,7 @@ use prelude::v1::*; use any::Any; use cell::Cell; use cmp; -use failure; +use panicking; use fmt; use intrinsics; use libc::c_void; @@ -534,10 +534,10 @@ pub fn begin_unwind(msg: M, file_line: &(&'static str, uint)) -> /// }` from ~1900/3700 (-O/no opts) to 180/590. #[inline(never)] #[cold] // this is the slow path, please never inline this fn begin_unwind_inner(msg: Box, file_line: &(&'static str, uint)) -> ! { - // Make sure the default failure handler is registered before we look at the + // Make sure the default panic handler is registered before we look at the // callbacks. static INIT: Once = ONCE_INIT; - INIT.call_once(|| unsafe { register(failure::on_fail); }); + INIT.call_once(|| unsafe { register(panicking::on_panic); }); // First, invoke call the user-defined callbacks triggered on thread panic. // -- cgit 1.4.1-3-g733a5