diff options
| author | bors <bors@rust-lang.org> | 2014-01-28 03:31:25 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-28 03:31:25 -0800 |
| commit | a39be7ca2ef65f08c160404c1675d93ee7d0f059 (patch) | |
| tree | d5a152aeb2f83e8171c1ecaf099d6143d38bb1ab /src/libstd | |
| parent | e90a8c4a35bffe6f0b9b46185147f907b79191ca (diff) | |
| parent | 2e24adf52182b6162e42fed5ec004e73bbefa213 (diff) | |
| download | rust-a39be7ca2ef65f08c160404c1675d93ee7d0f059.tar.gz rust-a39be7ca2ef65f08c160404c1675d93ee7d0f059.zip | |
auto merge of #11858 : huonw/rust/11841-followup, r=brson
Follow-up to #11841 which added this function.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 25a92148e96..88c6b52ec23 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -391,6 +391,10 @@ pub fn begin_unwind_raw(msg: *u8, file: *u8, line: uint) -> ! { /// the actual formatting into this shared place. #[inline(never)] #[cold] pub fn begin_unwind_fmt(msg: &fmt::Arguments, file: &'static str, line: uint) -> ! { + // We do two allocations here, unfortunately. But (a) they're + // required with the current scheme, and (b) we don't handle + // failure + OOM properly anyway (see comment in begin_unwind + // below). begin_unwind_inner(~fmt::format(msg), file, line) } |
