From 60c89ad8aceac7a4c9e32cd8a245bcd69e81e5b3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 24 Dec 2020 10:23:29 +0100 Subject: Cleanup: Replace match with method chaining Signed-off-by: Matthias Beyer --- src/routes/mod.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 33b9d09..d1548ac 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -29,16 +29,13 @@ struct ReturnToParams<'a> { type CookieMap<'a> = std::collections::HashMap<&'a str, ginger::Cookie<'a>>; fn get_cookie_map(src: Option<&str>) -> Result { - match src { - None => Ok(Default::default()), - Some(src) => { - use fallible_iterator::FallibleIterator; - - fallible_iterator::convert(ginger::parse_cookies(src)) - .map(|cookie| Ok((cookie.name, cookie))) - .collect() - } - } + use fallible_iterator::FallibleIterator; + + src.map(|s| { + fallible_iterator::convert(ginger::parse_cookies(s)) + .map(|cookie| Ok((cookie.name, cookie))) + .collect() + }).unwrap_or_else(|| Ok(Default::default())) } fn get_cookie_map_for_req<'a>( -- cgit v1.2.3