From 9dbcb303d6533a89b4edff14eacfdb0526444008 Mon Sep 17 00:00:00 2001 From: Thomas Hurst Date: Fri, 7 Sep 2018 01:53:59 +0100 Subject: Tidy parse_param_content --- src/lib.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f468513..6a70a69 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -813,17 +813,16 @@ fn parse_param_content(content: &str) -> ParamContent { // There must be at least one token produced by split, even if it's empty. let value = tokens.next().unwrap().trim(); let map = tokens - .filter_map(|kv| if let Some(idx) = kv.find('=') { - let key = kv[0..idx].trim().to_lowercase(); - let mut value = kv[idx + 1..].trim(); - if value.starts_with('"') && value.ends_with('"') { - value = &value[1..value.len() - 1]; - } - Some((key, value.to_string())) - } else { - None - }) - .collect(); + .filter_map(|kv| { + kv.find('=').map(|idx| { + let key = kv[0..idx].trim().to_lowercase(); + let mut value = kv[idx + 1..].trim(); + if value.starts_with('"') && value.ends_with('"') { + value = &value[1..value.len() - 1]; + } + (key, value.to_string()) + }) + }).collect(); ParamContent { value: value.into(), -- cgit v1.2.3