tile: Use anyhow extension traits

to make logging and panicking behavior more concise in the code.
zellij-org · Aug 19, 2022 · f9d58dc · f9d58dc
1 parent 526d9c2
commit f9d58dc
Showing 1 changed file with 32 additions and 33 deletions.
diff --git a/zellij-tile/src/lib.rs b/zellij-tile/src/lib.rs
@@ -57,52 +57,51 @@ macro_rules! register_plugin {
         thread_local! {
             static STATE: std::cell::RefCell<$t> = std::cell::RefCell::new(Default::default());
         }
+        use zellij_tile::prelude::errors::FatalError;
+        use zellij_tile::prelude::errors::LoggableError;
 
         fn main() {
-            catch_fatal(
-                STATE
-                    .with(|state| {
-                        catch_fatal(
-                            state
-                                .try_borrow_mut()
-                                .context("Failed to borrow plugin state for loading"),
-                        )
+            STATE
+                .with(|state| {
+                    state
+                        .try_borrow_mut()
+                        .context("Failed to borrow plugin state for loading")
+                        .fatal()
                         .load()
-                    })
-                    .context("Failed to get plugin for loading"),
-            );
+                })
+                .context("Failed to get plugin for loading")
+                .fatal()
         }
 
         #[no_mangle]
         pub fn update() {
-            catch(
-                STATE
-                    .with(|state| {
-                        catch_fatal(
-                            state
-                                .try_borrow_mut()
-                                .context("Failed to borrow plugin state for updating"),
-                        )
-                        .update(catch_fatal(
+            STATE
+                .with(|state| {
+                    state
+                        .try_borrow_mut()
+                        .context("Failed to borrow plugin state for updating")
+                        .fatal()
+                        .update(
                             $crate::shim::object_from_stdin()
-                                .context("Failed to read plugin input for updating"),
-                        ))
-                    })
-                    .context("Failed to get plugin for updating"),
-            );
+                                .context("Failed to read plugin input for updating")
+                                .fatal(),
+                        )
+                })
+                .context("Failed to get plugin for updating")
+                .to_stdout()
+                .non_fatal();
         }
 
         #[no_mangle]
         pub fn render(rows: i32, cols: i32) {
             STATE.with(|state| {
-                catch(
-                    catch_fatal(
-                        state
-                            .try_borrow_mut()
-                            .context("Failed to borrow plugin state for rendering"),
-                    )
-                    .render(rows as usize, cols as usize),
-                )
+                state
+                    .try_borrow_mut()
+                    .context("Failed to borrow plugin state for rendering")
+                    .fatal()
+                    .render(rows as usize, cols as usize)
+                    .to_stdout()
+                    .non_fatal()
             });
         }
     };