From 7d508d684f529d2f4d3f96fcc45fbd14722413e2 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 13 May 2015 10:40:54 -0700 Subject: [PATCH] refactor(header): remove redundant closures --- src/header/common/access_control_allow_origin.rs | 2 +- src/header/common/cache_control.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/header/common/access_control_allow_origin.rs b/src/header/common/access_control_allow_origin.rs index 9d32919c..06d758e3 100644 --- a/src/header/common/access_control_allow_origin.rs +++ b/src/header/common/access_control_allow_origin.rs @@ -41,7 +41,7 @@ impl Header for AccessControlAllowOrigin { b"*" => Some(AccessControlAllowOrigin::Any), b"null" => Some(AccessControlAllowOrigin::Null), r => if let Ok(s) = str::from_utf8(r) { - Url::parse(s).ok().map(|url| AccessControlAllowOrigin::Value(url)) + Url::parse(s).ok().map(AccessControlAllowOrigin::Value) } else { None } } } else { None } diff --git a/src/header/common/cache_control.rs b/src/header/common/cache_control.rs index 58cbf51e..ab7dd6ca 100644 --- a/src/header/common/cache_control.rs +++ b/src/header/common/cache_control.rs @@ -127,10 +127,10 @@ impl FromStr for CacheDirective { "" => Err(None), _ => match s.find('=') { Some(idx) if idx+1 < s.len() => match (&s[..idx], (&s[idx+1..]).trim_matches('"')) { - ("max-age" , secs) => secs.parse().map(MaxAge).map_err(|x| Some(x)), - ("max-stale", secs) => secs.parse().map(MaxStale).map_err(|x| Some(x)), - ("min-fresh", secs) => secs.parse().map(MinFresh).map_err(|x| Some(x)), - ("s-maxage", secs) => secs.parse().map(SMaxAge).map_err(|x| Some(x)), + ("max-age" , secs) => secs.parse().map(MaxAge).map_err(Some), + ("max-stale", secs) => secs.parse().map(MaxStale).map_err(Some), + ("min-fresh", secs) => secs.parse().map(MinFresh).map_err(Some), + ("s-maxage", secs) => secs.parse().map(SMaxAge).map_err(Some), (left, right) => Ok(Extension(left.to_owned(), Some(right.to_owned()))) }, Some(_) => Err(None),