do not use catch_unwind unless panic=unwind

MingweiSamuel · Dec 11, 2024 · 358632e · 358632e
1 parent 327e197
commit 358632e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/hydroflow_lang/src/diagnostic.rs b/hydroflow_lang/src/diagnostic.rs
@@ -71,7 +71,7 @@ impl Diagnostic {
     /// Emit if possible, otherwise return `Err` containing a [`TokenStream`] of a
     /// `compile_error!(...)` call.
     pub fn try_emit(&self) -> Result<(), TokenStream> {
-        #[cfg(nightly)]
+        #[cfg(all(nightly, panic = "unwind"))]
         {
             if let Ok(()) = std::panic::catch_unwind(|| {
                 let pm_diag = match self.level {
@@ -193,7 +193,7 @@ pub struct SerdeSpan {
 }
 impl From<Span> for SerdeSpan {
     fn from(span: Span) -> Self {
-        #[cfg(nightly)]
+        #[cfg(all(nightly, panic = "unwind"))]
         let path = std::panic::catch_unwind(|| span.unwrap())
             .map(|span| span.source_file().path().display().to_string())
             .ok();

diff --git a/hydroflow_lang/src/graph/hydroflow_graph.rs b/hydroflow_lang/src/graph/hydroflow_graph.rs
@@ -1009,7 +1009,7 @@ impl HydroflowGraph {
                                 #[cfg(not(nightly))]
                                 let source_info = Option::<String>::None;
 
-                                #[cfg(nightly)]
+                                #[cfg(all(nightly, panic = "unwind"))]
                                 let source_info = std::panic::catch_unwind(|| op_span.unwrap())
                                     .map(|op_span| {
                                         format!(

diff --git a/hydroflow_lang/src/pretty_span.rs b/hydroflow_lang/src/pretty_span.rs
@@ -5,7 +5,7 @@
 pub struct PrettySpan(pub proc_macro2::Span);
 impl std::fmt::Display for PrettySpan {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        #[cfg(nightly)]
+        #[cfg(all(nightly, panic = "unwind"))]
         {
             if let Ok(span) = std::panic::catch_unwind(|| self.0.unwrap()) {
                 write!(