rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename begin_unwind_string to fail_str, refs #16114

Browse Source
This commit is contained in:
Florian Hahn
2014-09-22 23:14:33 +02:00
parent 1c7d253ca3
commit c8b767dd3d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcore/failure.rs
View File

@@ -41,7 +41,7 @@ fn fail_(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
let (expr, file, line) = *expr_file_line; let (expr, file, line) = *expr_file_line;
let ref file_line = (file, line); let ref file_line = (file, line);
format_args!(|args| -> () { format_args!(|args| -> () {
fail_impl(args, file_line); fail_fmt(args, file_line);
}, "{}", expr); }, "{}", expr);
unsafe { intrinsics::abort() } unsafe { intrinsics::abort() }
@@ -54,7 +54,7 @@ fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
let (expr, file, line) = *expr_file_line; let (expr, file, line) = *expr_file_line;
let ref file_line = (file, line); let ref file_line = (file, line);
format_args!(|args| -> () { format_args!(|args| -> () {
fail_impl(args, file_line); fail_fmt(args, file_line);
}, "{}", expr); }, "{}", expr);
unsafe { intrinsics::abort() } unsafe { intrinsics::abort() }
@@ -65,18 +65,18 @@ fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
fn fail_bounds_check(file_line: &(&'static str, uint), fn fail_bounds_check(file_line: &(&'static str, uint),
index: uint, len: uint) -> ! { index: uint, len: uint) -> ! {
format_args!(|args| -> () { format_args!(|args| -> () {
fail_impl(args, file_line); fail_fmt(args, file_line);
}, "index out of bounds: the len is {} but the index is {}", len, index); }, "index out of bounds: the len is {} but the index is {}", len, index);
unsafe { intrinsics::abort() } unsafe { intrinsics::abort() }
} }
#[cold] #[inline(never)] #[cold] #[inline(never)]
pub fn fail_impl_string(msg: &str, file: &(&'static str, uint)) -> ! { pub fn fail_str(msg: &str, file: &(&'static str, uint)) -> ! {
format_args!(|fmt| fail_impl(fmt, file), "{}", msg) format_args!(|fmt| fail_fmt(fmt, file), "{}", msg)
} }
#[cold] #[inline(never)] #[cold] #[inline(never)]
pub fn fail_impl(fmt: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! { pub fn fail_fmt(fmt: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! {
#[allow(ctypes)] #[allow(ctypes)]
extern { extern {

4
src/libcore/macros.rs
View File

@@ -18,7 +18,7 @@ macro_rules! fail(
); );
($msg:expr) => ({ ($msg:expr) => ({
static _FILE_LINE: (&'static str, uint) = (file!(), line!()); static _FILE_LINE: (&'static str, uint) = (file!(), line!());
::core::failure::fail_impl_string($msg, &_FILE_LINE) ::core::failure::fail_str($msg, &_FILE_LINE)
}); });
($fmt:expr, $($arg:tt)*) => ({ ($fmt:expr, $($arg:tt)*) => ({
// a closure can't have return type !, so we need a full // a closure can't have return type !, so we need a full
@@ -40,7 +40,7 @@ macro_rules! fail(
#[inline(always)] #[inline(always)]
fn _run_fmt(fmt: &::std::fmt::Arguments) -> ! { fn _run_fmt(fmt: &::std::fmt::Arguments) -> ! {
static _FILE_LINE: (&'static str, uint) = (file!(), line!()); static _FILE_LINE: (&'static str, uint) = (file!(), line!());
::core::failure::fail_impl(fmt, &_FILE_LINE) ::core::failure::fail_fmt(fmt, &_FILE_LINE)
} }
format_args!(_run_fmt, $fmt, $($arg)*) format_args!(_run_fmt, $fmt, $($arg)*)
}); });