aboutsummaryrefslogtreecommitdiff
path: root/src/framework/standard
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-12-18 18:47:43 +0100
committeracdenisSK <[email protected]>2017-12-18 18:47:43 +0100
commitb60d0378548a53ffefda17aab403c073d3438cf6 (patch)
tree9e9b3c9babef8aeee81c539f8461de1deea39a6b /src/framework/standard
parentFix multiple char delimiters (diff)
downloadserenity-b60d0378548a53ffefda17aab403c073d3438cf6.tar.xz
serenity-b60d0378548a53ffefda17aab403c073d3438cf6.zip
Fix ifs
Diffstat (limited to 'src/framework/standard')
-rw-r--r--src/framework/standard/args.rs12
1 files changed, 6 insertions, 6 deletions
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]);
/// ```