mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-03 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ignore PanicInfo deprecation for now

Browse source 
We'll be able to use PanicHookInfo after dropping support for Rust 1.81.
This commit is contained in:
David Tolnay 2024-07-21 19:35:11 -07:00
parent 7f38154828
commit a867b30bcd
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -41,7 +41,7 @@ use std::error::Error as StdError;
use std::ffi::{OsStr, OsString};
use std::io::{self, BufRead, IsTerminal, Write};
use std::iter;
use std::panic::{self, PanicInfo, UnwindSafe};
use std::panic::{self, UnwindSafe};
use std::path::{Path, PathBuf};
use std::process::{self, Command, Stdio};
use std::ptr;
@ -49,6 +49,9 @@ use std::str;
use std::thread::Result as ThreadResult;
use termcolor::{Color::Green, ColorChoice, ColorSpec, StandardStream, WriteColor};
#[allow(deprecated)] // https://github.com/dtolnay/cargo-expand/issues/229
use std::panic::PanicInfo;
cargo_subcommand_metadata::description!("Show result of macro expansion");
fn main() {
@ -597,6 +600,7 @@ fn ignore_panic<F, T>(f: F) -> ThreadResult<T>
where
F: UnwindSafe + FnOnce() -> T,
{
#[allow(deprecated)] // https://github.com/dtolnay/cargo-expand/issues/229
type PanicHook = dyn Fn(&PanicInfo) + Sync + Send + 'static;
let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });