OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #10042 : thestinger/rust/fail, r=sanxiyn 

Closes #10023
This commit is contained in:
bors 2013-10-24 05:11:06 -07:00
parent f27dfa04e5 a3ae48cb36
commit 7075eb3625
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/rt/borrowck.rs
View File

@ -57,7 +57,7 @@ pub fn clear_task_borrow_list() {
let _ = try_take_task_borrow_list();
}
unsafe fn fail_borrowed(box: *mut raw::Box<()>, file: *c_char, line: size_t) {
unsafe fn fail_borrowed(box: *mut raw::Box<()>, file: *c_char, line: size_t) -> ! {
debug_borrow("fail_borrowed: ", box, 0, 0, file, line);
match try_take_task_borrow_list() {

3
src/libstd/unstable/lang.rs
View File

@ -22,8 +22,7 @@ pub fn fail_(expr: *c_char, file: *c_char, line: size_t) -> ! {
}
#[lang="fail_bounds_check"]
pub fn fail_bounds_check(file: *c_char, line: size_t,
index: size_t, len: size_t) {
pub fn fail_bounds_check(file: *c_char, line: size_t, index: size_t, len: size_t) -> ! {
let msg = format!("index out of bounds: the len is {} but the index is {}",
len as uint, index as uint);
do msg.with_c_str |buf| {