From b60d0378548a53ffefda17aab403c073d3438cf6 Mon Sep 17 00:00:00 2001
From: acdenisSK <acdenissk69@gmail.com>
Date: Mon, 18 Dec 2017 18:47:43 +0100
Subject: Fix ifs

---
 src/framework/standard/args.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/framework')

diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index 8c23fd6..1076507 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -84,11 +84,11 @@ fn parse<T: FromStr>(s: &mut String, delimiter: &str) -> Result<T, T::Err>
     // First find out whether the delimiter is 2 chars or longer, 
     // if so add those extras to the position.
     // Otherwise just add `1` for 1 char delimiters.
-    pos += if delimiter.len() > 1 {
-        delimiter.len()
-    } else {
-        1
-    };
+    if delimiter.len() > 1 {
+        pos += delimiter.len();
+    } else if pos < s.len() {
+        pos += 1;
+    }
 
     s.drain(..pos);
     res
@@ -340,7 +340,7 @@ impl Args {
     /// ```rust
     /// use serenity::framework::standard::Args;
     ///
-    /// let mut args = Args::new("42 69", &[" ".to_string()]);
+    /// let args = Args::new("42 69", &[" ".to_string()]);
     ///
     /// assert_eq!(*args.multiple::<i32>().unwrap(), [42, 69]);
     /// ```
-- 
cgit v1.2.3