diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2024-01-31 10:27:29 +0100 |
|---|---|---|
| committer | Mara Bos <m-ou.se@m-ou.se> | 2024-06-11 15:47:00 +0200 |
| commit | 64e56db72aa2b1f112504504a7dceba63881cdef (patch) | |
| tree | 15442a2c1fe1609d903a1d3630c1650f907c1e89 /library/test | |
| parent | b6180a918538b3afa04bbc1c5515c0be2154e1b6 (diff) | |
| download | rust-64e56db72aa2b1f112504504a7dceba63881cdef.tar.gz rust-64e56db72aa2b1f112504504a7dceba63881cdef.zip | |
Rename std::panic::PanicInfo to PanicHookInfo.
Diffstat (limited to 'library/test')
| -rw-r--r-- | library/test/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/test/src/lib.rs b/library/test/src/lib.rs index 7bd08a0605f..7aff7fe1fdd 100644 --- a/library/test/src/lib.rs +++ b/library/test/src/lib.rs @@ -58,7 +58,7 @@ use std::{ env, io, io::prelude::Write, mem::ManuallyDrop, - panic::{self, catch_unwind, AssertUnwindSafe, PanicInfo}, + panic::{self, catch_unwind, AssertUnwindSafe, PanicHookInfo}, process::{self, Command, Termination}, sync::mpsc::{channel, Sender}, sync::{Arc, Mutex}, @@ -123,7 +123,7 @@ pub fn test_main(args: &[String], tests: Vec<TestDescAndFn>, options: Option<Opt // from interleaving with the panic message or appearing after it. let builtin_panic_hook = panic::take_hook(); let hook = Box::new({ - move |info: &'_ PanicInfo<'_>| { + move |info: &'_ PanicHookInfo<'_>| { if !info.can_unwind() { std::mem::forget(std::io::stderr().lock()); let mut stdout = ManuallyDrop::new(std::io::stdout().lock()); @@ -726,7 +726,7 @@ fn spawn_test_subprocess( fn run_test_in_spawned_subprocess(desc: TestDesc, runnable_test: RunnableTest) -> ! { let builtin_panic_hook = panic::take_hook(); - let record_result = Arc::new(move |panic_info: Option<&'_ PanicInfo<'_>>| { + let record_result = Arc::new(move |panic_info: Option<&'_ PanicHookInfo<'_>>| { let test_result = match panic_info { Some(info) => calc_result(&desc, Err(info.payload()), &None, &None), None => calc_result(&desc, Ok(()), &None, &None), |
