Skip to content

Commit bc32aad

Browse files
committed
---
yaml --- r: 273302 b: refs/heads/beta c: 157e1bc h: refs/heads/master
1 parent da34279 commit bc32aad

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 159eae8b8b32f76c1ae945cdfc52fb77ffc01d52
26+
refs/heads/beta: 157e1bc6811b033bf640b68ffdf3ea0f1b804ccf
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libstd/panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub use panicking::{take_hook, set_hook, PanicInfo, Location};
2929
#[rustc_deprecated(since = "1.9.0", reason = "renamed to set_hook")]
3030
#[unstable(feature = "panic_handler", reason = "awaiting feedback", issue = "30449")]
3131
pub fn set_handler<F>(handler: F) where F: Fn(&PanicInfo) + 'static + Sync + Send {
32-
set_hook(handler)
32+
set_hook(Box::new(handler))
3333
}
3434

3535
///

branches/beta/src/libstd/panicking.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,11 @@ static FIRST_PANIC: AtomicBool = AtomicBool::new(true);
5858
///
5959
/// Panics if called from a panicking thread.
6060
#[unstable(feature = "panic_handler", reason = "awaiting feedback", issue = "30449")]
61-
pub fn set_hook<F>(hook: F) where F: Fn(&PanicInfo) + 'static + Sync + Send {
61+
pub fn set_hook(hook: Box<Fn(&PanicInfo) + 'static + Sync + Send>) {
6262
if thread::panicking() {
6363
panic!("cannot modify the panic hook from a panicking thread");
6464
}
6565

66-
let hook = Box::new(hook);
6766
unsafe {
6867
let lock = HOOK_LOCK.write();
6968
let old_hook = HOOK;

0 commit comments

Comments
 (0)