From 3a4cb18be8ca33d507cbfc88fec79b2a6c5d8bfc Mon Sep 17 00:00:00 2001
From: Jacob Helwig <jacob@technosorcery.net>
Date: Sat, 7 Oct 2017 02:43:42 -0700
Subject: Do not to " " if none of the provided delimiters are found (#183)

---
 src/framework/standard/args.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/framework/standard/args.rs')

diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index d03076f..8f166b6 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -18,7 +18,7 @@ impl<E: StdError> From<E> for Error<E> {
     fn from(e: E) -> Self {
         Error::Parse(e)
     }
-} 
+}
 
 impl<E: StdError> StdError for Error<E> {
     fn description(&self) -> &str {
@@ -60,7 +60,12 @@ pub struct Args {
 }
 
 impl Args {
-    pub fn new(message: &str, delimiter: &str) -> Self {
+    pub fn new(message: &str, possible_delimiters: Vec<String>) -> Self {
+        let delimiter = possible_delimiters
+            .iter()
+            .find(|&d| message.contains(d))
+            .map_or(possible_delimiters[0].as_str(), |s| s.as_str());
+
         let split = if message.trim().is_empty() {
             Vec::new()
         } else {
-- 
cgit v1.2.3