Skip to content

Commit a39be7c

Browse files
committedJan 28, 2014
auto merge of #11858 : huonw/rust/11841-followup, r=brson
Follow-up to #11841 which added this function.
2 parents e90a8c4 + 2e24adf commit a39be7c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed
 

‎src/libstd/rt/unwind.rs

+4
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ pub fn begin_unwind_raw(msg: *u8, file: *u8, line: uint) -> ! {
391391
/// the actual formatting into this shared place.
392392
#[inline(never)] #[cold]
393393
pub fn begin_unwind_fmt(msg: &fmt::Arguments, file: &'static str, line: uint) -> ! {
394+
// We do two allocations here, unfortunately. But (a) they're
395+
// required with the current scheme, and (b) we don't handle
396+
// failure + OOM properly anyway (see comment in begin_unwind
397+
// below).
394398
begin_unwind_inner(~fmt::format(msg), file, line)
395399
}
396400

0 commit comments

Comments
 (0)
Please sign in to comment.