std: Don't abort process when printing panics in tests
This commit fixes an issue when using `set_print` and friends, notably used by libtest, to avoid aborting the process if printing panics. This previously panicked due to borrowing a mutable `RefCell` twice, and this is worked around by borrowing these cells for less time, instead taking out and removing contents temporarily. Closes #69558
This commit is contained in:
parent
23de8275c9
commit
d5b6a20557
@ -792,10 +792,14 @@ fn print_to<T>(
|
||||
{
|
||||
let result = local_s
|
||||
.try_with(|s| {
|
||||
if let Ok(mut borrowed) = s.try_borrow_mut() {
|
||||
if let Some(w) = borrowed.as_mut() {
|
||||
return w.write_fmt(args);
|
||||
}
|
||||
// Note that we completely remove a local sink to write to in case
|
||||
// our printing recursively panics/prints, so the recursive
|
||||
// panic/print goes to the global sink instead of our local sink.
|
||||
let prev = s.borrow_mut().take();
|
||||
if let Some(mut w) = prev {
|
||||
let result = w.write_fmt(args);
|
||||
*s.borrow_mut() = Some(w);
|
||||
return result;
|
||||
}
|
||||
global_s().write_fmt(args)
|
||||
})
|
||||
|
24
src/test/ui/panic-while-printing.rs
Normal file
24
src/test/ui/panic-while-printing.rs
Normal file
@ -0,0 +1,24 @@
|
||||
// run-pass
|
||||
// ignore-emscripten no subprocess support
|
||||
|
||||
#![feature(set_stdio)]
|
||||
|
||||
use std::fmt;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::io::set_panic;
|
||||
|
||||
pub struct A;
|
||||
|
||||
impl Display for A {
|
||||
fn fmt(&self, _f: &mut Formatter<'_>) -> fmt::Result {
|
||||
panic!();
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
set_panic(Some(Box::new(Vec::new())));
|
||||
assert!(std::panic::catch_unwind(|| {
|
||||
eprintln!("{}", A);
|
||||
})
|
||||
.is_err());
|
||||
}
|
24
src/test/ui/test-panic-while-printing.rs
Normal file
24
src/test/ui/test-panic-while-printing.rs
Normal file
@ -0,0 +1,24 @@
|
||||
// compile-flags:--test
|
||||
// run-pass
|
||||
// ignore-emscripten no subprocess support
|
||||
|
||||
use std::fmt;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
pub struct A(Vec<u32>);
|
||||
|
||||
impl Display for A {
|
||||
fn fmt(&self, _f: &mut Formatter<'_>) -> fmt::Result {
|
||||
self.0[0];
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn main() {
|
||||
let result = std::panic::catch_unwind(|| {
|
||||
let a = A(vec![]);
|
||||
eprintln!("{}", a);
|
||||
});
|
||||
assert!(result.is_err());
|
||||
}
|
Loading…
Reference in New Issue
Block a user