From 3e84e06fb99f0cb2c4db0377c5891a19c5c726a3 Mon Sep 17 00:00:00 2001
From: Austen Adler <agadler@austenadler.com>
Date: Wed, 10 Aug 2022 20:21:58 -0400
Subject: [PATCH] Add support for accepting AsRef<str>

---
 kakplugin/src/lib.rs | 10 +++++++---
 src/box_.rs          |  8 +++++---
 src/main.rs          |  2 +-
 src/uniq.rs          |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/kakplugin/src/lib.rs b/kakplugin/src/lib.rs
index 4f359ea..431cdea 100644
--- a/kakplugin/src/lib.rs
+++ b/kakplugin/src/lib.rs
@@ -23,8 +23,11 @@ pub fn get_selections(keys: Option<&'_ str>) -> Result<Vec<Selection>, KakError>
 ///
 /// Will return `Err` if command fifo could not be opened, read from, or written to
 // TODO: Use AsRef
-pub fn get_selections_desc(keys: Option<&'_ str>) -> Result<Vec<SelectionDesc>, KakError> {
-    response("%val{selections_desc}", keys)?
+pub fn get_selections_desc<S>(keys: Option<S>) -> Result<Vec<SelectionDesc>, KakError>
+where
+    S: AsRef<str>,
+{
+    response("%val{selections_desc}", keys.as_ref())?
         .iter()
         .map(|sd| SelectionDesc::from_str(sd))
         .collect::<Result<Vec<_>, KakError>>()
@@ -184,9 +187,10 @@ where
 /// # Errors
 ///
 /// Will return `Err` if command fifo could not be opened or written to
-pub fn response<S1>(msg: S1, keys: Option<&'_ str>) -> Result<Vec<String>, KakError>
+pub fn response<S1, S2>(msg: S1, keys: Option<S2>) -> Result<Vec<String>, KakError>
 where
     S1: AsRef<str>,
+    S2: AsRef<str>,
 {
     let response_fifo = get_var("kak_response_fifo")?;
 
diff --git a/src/box_.rs b/src/box_.rs
index ab066af..bf6a7fb 100644
--- a/src/box_.rs
+++ b/src/box_.rs
@@ -12,8 +12,10 @@ pub struct Options {
 pub fn box_(options: &Options) -> Result<String, KakError> {
     if options.bounding_box {
         // The user requested only the bounding box, so select it first
-        set_selections_desc(vec![get_bounding_box(get_selections_desc(None)?)
-            .ok_or_else(|| KakError::Custom(String::from("Selection is empty")))?])?;
+        set_selections_desc(vec![get_bounding_box(get_selections_desc::<&str>(None)?)
+            .ok_or_else(|| {
+            KakError::Custom(String::from("Selection is empty"))
+        })?])?;
     }
 
     let ret_selections_desc = boxed_selections(options)?;
@@ -62,7 +64,7 @@ where
 fn boxed_selections(_options: &Options) -> Result<Vec<SelectionDesc>, KakError> {
     // The selections we want to box, one per box
     let selections_desc = {
-        let mut ret = get_selections_desc(None)?;
+        let mut ret = get_selections_desc::<&str>(None)?;
         ret.sort();
         ret
     };
diff --git a/src/main.rs b/src/main.rs
index 1ea990f..1d130ac 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,7 +48,7 @@ enum Commands {
     Shuf(shuf::Options),
     #[clap(about = "Find unique selections based on optional regex match")]
     Uniq(uniq::Options),
-    #[clap(about = "Invert all selections"), visible_aliases = &["inverse"]]
+    #[clap(about = "Invert all selections", visible_aliases = &["inverse"])]
     Invert(invert::Options),
     #[clap(about = "Evaluate selections as a math expression", visible_aliases = &["bc", "eval"])]
     MathEval(math_eval::Options),
diff --git a/src/uniq.rs b/src/uniq.rs
index 8e1ddea..7ec9bf8 100644
--- a/src/uniq.rs
+++ b/src/uniq.rs
@@ -51,7 +51,7 @@ pub fn uniq(options: &Options) -> Result<String, KakError> {
     }))?;
 
     // Deselect all `None` strings (all rows that have been seen before)
-    let mut new_selections_desc = get_selections_desc(None)?;
+    let mut new_selections_desc = get_selections_desc::<&str>(None)?;
     new_selections_desc.sort();
     set_selections_desc(
         // Refresh seelections_desc because positions have changed