From 1df6f4cd5cd221e17aa21f172aa1f9615fe6d6a1 Mon Sep 17 00:00:00 2001
From: Maximilian Roos <m@maxroos.com>
Date: Thu, 29 Feb 2024 21:26:39 -0800
Subject: [PATCH] fix(rust): Fix skim's panic handler

---
 rust/skim/src/lib.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/rust/skim/src/lib.rs b/rust/skim/src/lib.rs
index a20b1b35033..58d5be51baa 100644
--- a/rust/skim/src/lib.rs
+++ b/rust/skim/src/lib.rs
@@ -1,7 +1,7 @@
-use skim::prelude::*;
-use term::terminfo::TermInfo;
 use cxx::{CxxString, CxxVector};
+use skim::prelude::*;
 use std::panic;
+use term::terminfo::TermInfo;
 
 #[cxx::bridge]
 mod ffi {
@@ -16,7 +16,7 @@ struct Item {
 }
 impl Item {
     fn new(text: String) -> Self {
-        return Self{
+        Self {
             // Text that will be printed by skim, and will be used for matching.
             //
             // Text that will be shown should not contains new lines since in this case skim may
@@ -24,16 +24,16 @@ impl Item {
             text_no_newlines: text.replace("\n", " "),
             // This will be used when the match had been selected.
             orig_text: text,
-        };
+        }
     }
 }
 impl SkimItem for Item {
     fn text(&self) -> Cow<str> {
-        return Cow::Borrowed(&self.text_no_newlines);
+        Cow::Borrowed(&self.text_no_newlines)
     }
 
     fn output(&self) -> Cow<str> {
-        return Cow::Borrowed(&self.orig_text);
+        Cow::Borrowed(&self.orig_text)
     }
 }
 
@@ -88,14 +88,11 @@ fn skim_impl(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String,
     if output.selected_items.is_empty() {
         return Err("No items had been selected".to_string());
     }
-    return Ok(output.selected_items[0].output().to_string());
+    Ok(output.selected_items[0].output().to_string())
 }
 
 fn skim(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, String> {
-    let ret = panic::catch_unwind(|| {
-        return skim_impl(prefix, words);
-    });
-    return match ret {
+    match panic::catch_unwind(|| skim_impl(prefix, words)) {
         Err(err) => {
             let e = if let Some(s) = err.downcast_ref::<String>() {
                 format!("{}", s)
@@ -105,7 +102,7 @@ fn skim(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, Stri
                 format!("Unknown panic type: {:?}", err.type_id())
             };
             Err(format!("Rust panic: {:?}", e))
-        },
+        }
         Ok(res) => res,
     }
 }