From 089e996d708482322b091eb71fae8a40f3641611 Mon Sep 17 00:00:00 2001
From: Jacob Rothstein <hi@jbr.me>
Date: Thu, 25 Jun 2020 14:20:51 -0700
Subject: [PATCH] clippied

---
 src/listener/multi_listener.rs | 21 +--------------------
 src/listener/to_listener.rs    | 10 +++++++---
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/listener/multi_listener.rs b/src/listener/multi_listener.rs
index 68140a489..768049b0a 100644
--- a/src/listener/multi_listener.rs
+++ b/src/listener/multi_listener.rs
@@ -33,6 +33,7 @@ use async_std::prelude::*;
 ///}
 ///```
 
+#[derive(Default)]
 pub struct MultiListener<State>(Vec<Box<dyn Listener<State>>>);
 
 impl<State: Send + Sync + 'static> MultiListener<State> {
@@ -75,26 +76,6 @@ impl<State: Send + Sync + 'static> MultiListener<State> {
         self.add(listener).expect("Unable to add listener");
         self
     }
-
-    /// from_iter allows for the construction of a new MultiListener
-    /// from collections of [`ToListener`](ToListener)s.
-    /// ```rust
-    /// # use tide::listener::MultiListener;
-    /// # fn main() -> std::io::Result<()> {
-    /// let mut multi = MultiListener::from_iter(vec!["127.0.0.1:8000", "tcp://localhost:8001"])?;
-    /// if cfg!(unix) {
-    ///     multi.add("unix:///var/run/tide/socket")?;
-    /// }
-    /// # std::mem::drop(tide::new().listen(multi)); // for the State generic
-    /// # Ok(()) }
-    /// ```
-    pub fn from_iter<TL: ToListener<State>>(vec: impl IntoIterator<Item = TL>) -> io::Result<Self> {
-        let mut multi = Self::new();
-        for listener in vec {
-            multi.add(listener)?;
-        }
-        Ok(multi)
-    }
 }
 
 impl<State: Send + Sync + 'static> Listener<State> for MultiListener<State> {
diff --git a/src/listener/to_listener.rs b/src/listener/to_listener.rs
index db1d0a9d9..3a60f92da 100644
--- a/src/listener/to_listener.rs
+++ b/src/listener/to_listener.rs
@@ -78,7 +78,7 @@ impl<State: Send + Sync + 'static> ToListener<State> for Url {
                         self.path()
                     ));
 
-                    return Ok(ParsedListener::Unix(UnixListener::from_path(path)));
+                    Ok(ParsedListener::Unix(UnixListener::from_path(path)))
                 }
 
                 #[cfg(not(unix))]
@@ -132,7 +132,7 @@ impl<State: Send + Sync + 'static> ToListener<State> for &str {
                             format!("unable to parse listener from `{}`", self),
                         )
                     })
-                    .and_then(|url| ToListener::<State>::to_listener(url))
+                    .and_then(ToListener::<State>::to_listener)
             })
     }
 }
@@ -230,7 +230,11 @@ impl<State: Send + Sync + 'static> ToListener<State> for std::net::SocketAddr {
 impl<TL: ToListener<State>, State: Send + Sync + 'static> ToListener<State> for Vec<TL> {
     type Listener = MultiListener<State>;
     fn to_listener(self) -> io::Result<Self::Listener> {
-        MultiListener::from_iter(self)
+        let mut multi = MultiListener::new();
+        for listener in self {
+            multi.add(listener)?;
+        }
+        Ok(multi)
     }
 }