diff options
| author | bors <bors@rust-lang.org> | 2013-10-24 05:11:06 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-24 05:11:06 -0700 |
| commit | 7075eb36254e673fad1055148ee1a02447371215 (patch) | |
| tree | 101040097841a1c18d7ab925047b359bd48c8c0b /src/libstd | |
| parent | f27dfa04e5535538f9ef389c29b814bcdfa91ba3 (diff) | |
| parent | a3ae48cb365f5d762265354e2dbdebfd757bd132 (diff) | |
| download | rust-7075eb36254e673fad1055148ee1a02447371215.tar.gz rust-7075eb36254e673fad1055148ee1a02447371215.zip | |
auto merge of #10042 : thestinger/rust/fail, r=sanxiyn
Closes #10023
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/borrowck.rs | 2 | ||||
| -rw-r--r-- | src/libstd/unstable/lang.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/rt/borrowck.rs b/src/libstd/rt/borrowck.rs index 4426a3eafe1..9d13e79464a 100644 --- a/src/libstd/rt/borrowck.rs +++ b/src/libstd/rt/borrowck.rs @@ -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() { diff --git a/src/libstd/unstable/lang.rs b/src/libstd/unstable/lang.rs index e30d0e77367..6dfb319d592 100644 --- a/src/libstd/unstable/lang.rs +++ b/src/libstd/unstable/lang.rs @@ -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| { |