Resolve lint warnings

2 files changed, 8 insertions, 11 deletions

diff --git a/src/components/mod.rs b/src/components/mod.rs
index a3986b5..5de2e67 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -154,14 +154,13 @@ impl<'a, T: HavingContent + 'a> render::Render for Content<'a, T> {
                 render::raw!(cleaned.as_ref()).render_into(writer)?;
                 writer.write_str("</p>")?;
             }
-            None => match self.src.content_text() {
-                Some(text) => {
+            None => {
+                if let Some(text) = self.src.content_text() {
                     writer.write_str("<p>")?;
                     text.render_into(writer)?;
                     writer.write_str("</p>")?;
                 }
-                None => {}
-            },
+            }
         }
 
         Ok(())
@@ -311,7 +310,7 @@ impl<'user> render::Render for UserLink<'user> {
 }
 
 pub trait GetIndex<K, V> {
-    fn get<'a>(&'a self, key: K) -> Option<&'a V>;
+    fn get(&self, key: K) -> Option<&V>;
 }
 
 impl<K: Borrow<Q> + Eq + std::hash::Hash, V, Q: ?Sized + Eq + std::hash::Hash> GetIndex<&Q, V>
@@ -323,7 +322,7 @@ impl<K: Borrow<Q> + Eq + std::hash::Hash, V, Q: ?Sized + Eq + std::hash::Hash> G
 }
 
 impl<I: serde_json::value::Index> GetIndex<I, serde_json::Value> for serde_json::Value {
-    fn get<'a>(&'a self, key: I) -> Option<&'a serde_json::Value> {
+    fn get(&self, key: I) -> Option<&serde_json::Value> {
         self.get(key)
     }
 }
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 5084e50..e046830 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -22,7 +22,7 @@ struct ReturnToParams<'a> {
 
 type CookieMap<'a> = std::collections::HashMap<&'a str, ginger::Cookie<'a>>;
 
-fn get_cookie_map<'a>(src: Option<&'a str>) -> Result<CookieMap<'a>, ginger::ParseError> {
+fn get_cookie_map(src: Option<&str>) -> Result<CookieMap, ginger::ParseError> {
     match src {
         None => Ok(Default::default()),
         Some(src) => {
@@ -41,13 +41,11 @@ fn get_cookie_map_for_req<'a>(
     get_cookie_map_for_headers(req.headers())
 }
 
-fn get_cookie_map_for_headers<'a>(
-    headers: &'a hyper::HeaderMap,
-) -> Result<CookieMap<'a>, crate::Error> {
+fn get_cookie_map_for_headers(headers: &hyper::HeaderMap) -> Result<CookieMap, crate::Error> {
     get_cookie_map(get_cookies_string(headers)?).map_err(Into::into)
 }
 
-fn get_cookies_string<'a>(headers: &'a hyper::HeaderMap) -> Result<Option<&'a str>, crate::Error> {
+fn get_cookies_string(headers: &hyper::HeaderMap) -> Result<Option<&str>, crate::Error> {
     Ok(headers
         .get(hyper::header::COOKIE)
         .map(|x| x.to_str())