use serde's derive to deserialize conf

2 files changed, 5 insertions, 5 deletions

diff --git a/src/command/completion.rs b/src/command/completion.rs
index bf647a2..1b479a0 100644
--- a/src/command/completion.rs
+++ b/src/command/completion.rs
@@ -64,8 +64,8 @@ impl Completions {
     ) -> Self {
         let completions = wholes.iter()
             .map(|w|
-                if w.starts_with(start) {
-                    &w[start.len()..]
+                if let Some(stripped) = w.strip_prefix(start) {
+                    stripped
                 } else {
                     // this might become a feature but right now it's a bug
                     warn!("unexpected non completing whole: {:?}", w);
diff --git a/src/command/sequence.rs b/src/command/sequence.rs
index ac064cd..87ee50e 100644
--- a/src/command/sequence.rs
+++ b/src/command/sequence.rs
@@ -26,10 +26,10 @@ impl Sequence {
             _ => String::from(";"),
         }
     }
-    pub fn new(raw: String, separator: Option<String>) -> Self {
+    pub fn new<S: Into<String>>(raw: S, separator: Option<S>) -> Self {
         Self {
-            raw,
-            separator: separator.unwrap_or_else(Sequence::local_separator),
+            raw: raw.into(),
+            separator: separator.map_or_else(Sequence::local_separator, |s| s.into()),
         }
     }
     pub fn new_single(cmd: String) -> Self {