refactor(header): remove redundant closures

hyperium · May 13, 2015 · 7d508d6 · 7d508d6
1 parent 7e3858c
commit 7d508d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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),