From b64c9d56700e2c41207166fe8709711ff02488ff Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 24 May 2016 14:24:44 -0700 Subject: std: Clean out old unstable + deprecated APIs These should all have been deprecated for at least one cycle, so this commit cleans them all out. --- src/test/run-fail/panic-set-handler.rs | 7 ++++--- src/test/run-fail/panic-set-unset-handler.rs | 9 +++++---- src/test/run-fail/panic-take-handler-nop.rs | 5 +++-- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src/test/run-fail') diff --git a/src/test/run-fail/panic-set-handler.rs b/src/test/run-fail/panic-set-handler.rs index bfeb407dd25..b589544ae15 100644 --- a/src/test/run-fail/panic-set-handler.rs +++ b/src/test/run-fail/panic-set-handler.rs @@ -10,13 +10,14 @@ // error-pattern:greetings from the panic handler -#![feature(std_panic, panic_handler)] +#![feature(panic_handler)] + use std::panic; use std::io::{self, Write}; fn main() { - panic::set_handler(|i| { + panic::set_hook(Box::new(|i| { write!(io::stderr(), "greetings from the panic handler"); - }); + })); panic!("foobar"); } diff --git a/src/test/run-fail/panic-set-unset-handler.rs b/src/test/run-fail/panic-set-unset-handler.rs index 6999aa715e7..4c895ea52aa 100644 --- a/src/test/run-fail/panic-set-unset-handler.rs +++ b/src/test/run-fail/panic-set-unset-handler.rs @@ -10,14 +10,15 @@ // error-pattern:thread '
' panicked at 'foobar' -#![feature(std_panic, panic_handler)] +#![feature(panic_handler)] + use std::panic; use std::io::{self, Write}; fn main() { - panic::set_handler(|i| { + panic::set_hook(Box::new(|i| { write!(io::stderr(), "greetings from the panic handler"); - }); - panic::take_handler(); + })); + panic::take_hook(); panic!("foobar"); } diff --git a/src/test/run-fail/panic-take-handler-nop.rs b/src/test/run-fail/panic-take-handler-nop.rs index fec1db24adf..58e57528e8a 100644 --- a/src/test/run-fail/panic-take-handler-nop.rs +++ b/src/test/run-fail/panic-take-handler-nop.rs @@ -10,10 +10,11 @@ // error-pattern:thread '
' panicked at 'foobar' -#![feature(std_panic, panic_handler)] +#![feature(panic_handler)] + use std::panic; fn main() { - panic::take_handler(); + panic::take_hook(); panic!("foobar"); } -- cgit 1.4.1-3-g733a5