feat(pickable): introduce SinglePickable trait

Extract a simplified trait for types that consume exactly one
argument, with a blanket implementation of the existing Pickable trait

1 files changed, 7 insertions, 15 deletions

diff --git a/mingling_picker/src/builtin/pick_string.rs b/mingling_picker/src/builtin/pick_string.rs
index 4a65873..c96f667 100644
--- a/mingling_picker/src/builtin/pick_string.rs
+++ b/mingling_picker/src/builtin/pick_string.rs
@@ -1,19 +1,11 @@
-use crate::parselib::{SingleMatcher, seek_single};
-use crate::pickable_needed::*;
+use crate::PickerArgResult::NotFound;
+use crate::{SinglePickable, pickable_needed::*};
 
-impl<'a> Pickable<'a> for String {
-    fn get_attr(flag: &'a PickerArg<'a, Self>) -> PickerArgAttr {
-        PickerArgAttr::positional_or_single(flag)
-    }
-
-    fn tag(ctx: TagPhaseContext) -> Vec<usize> {
-        SingleMatcher::tag(ctx)
-    }
-
-    fn pick(raw_strs: &[&str]) -> PickerArgResult<Self> {
-        match seek_single(raw_strs) {
-            Some(v) => PickerArgResult::Parsed(v.to_string()),
-            None => PickerArgResult::NotFound,
+impl SinglePickable for String {
+    fn pick_single(str: Option<&str>) -> PickerArgResult<Self> {
+        match str {
+            Some(str) => PickerArgResult::Parsed(str.to_string()),
+            None => NotFound,
         }
     }
 }