Merge pull request #817 from leodasvacas/clippy-run

seanmonstar · web-flow · commit f20d5953c775 · 2016-06-13T07:19:31.000-07:00
Clippy run and derive Default for Buffer
diff --git a/src/client/connect.rs b/src/client/connect.rs
@@ -88,7 +88,7 @@ impl Connect for HttpConnector {
         if let Some(key) = self.key(url) {
             let host = url.host_str().expect("http scheme must have a host");
             self.dns.as_ref().expect("dns workers lost").resolve(host);
-            self.resolving.entry(host.to_owned()).or_insert(Vec::new()).push(key.clone());
+            self.resolving.entry(host.to_owned()).or_insert_with(Vec::new).push(key.clone());
             Ok(key)
         } else {
             Err(io::Error::new(io::ErrorKind::InvalidInput, "scheme must be http"))
@@ -101,25 +101,18 @@ impl Connect for HttpConnector {
             Err(_) => return None
         };
         debug!("Http::resolved <- ({:?}, {:?})", host, addr);
-        match self.resolving.entry(host) {
-            Entry::Occupied(mut entry) => {
-                let resolved = entry.get_mut().remove(0);
-                if entry.get().is_empty() {
-                    entry.remove();
-                }
-                let port = resolved.2;
-                match addr {
-                    Ok(addr) => {
-                        Some((resolved, TcpStream::connect(&SocketAddr::new(addr, port))
-                            .map(HttpStream)))
-                    },
-                    Err(e) => Some((resolved, Err(e)))
-                }
-            }
-            _ => {
-                trace!("^--  resolved but not in hashmap?");
-                return None
+        if let Entry::Occupied(mut entry) = self.resolving.entry(host) {
+            let resolved = entry.get_mut().remove(0);
+            if entry.get().is_empty() {
+                entry.remove();
             }
+            let port = resolved.2;
+            Some((resolved, addr.and_then(|addr| TcpStream::connect(&SocketAddr::new(addr, port))
+                                                            .map(HttpStream))
+                ))
+        } else {
+            trace!("^--  resolved but not in hashmap?");
+            None
         }
     }
 
@@ -167,7 +160,7 @@ impl<S: SslClient> Connect for HttpsConnector<S> {
         if let Some(key) = self.key(url) {
             let host = url.host_str().expect("http scheme must have a host");
             self.http.dns.as_ref().expect("dns workers lost").resolve(host);
-            self.http.resolving.entry(host.to_owned()).or_insert(Vec::new()).push(key.clone());
+            self.http.resolving.entry(host.to_owned()).or_insert_with(Vec::new).push(key.clone());
             Ok(key)
         } else {
             Err(io::Error::new(io::ErrorKind::InvalidInput, "scheme must be http or https"))
diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -67,11 +67,11 @@ impl<H> Client<H> {
 
     /*TODO
     pub fn http() -> Config<HttpConnector> {
-    
+
     }
 
     pub fn https() -> Config<HttpsConnector> {
-    
+
     }
     */
 }
@@ -440,7 +440,7 @@ where C: Connect,
                 let now = scope.now();
                 let mut empty_keys = Vec::new();
                 {
-                    for (key, mut vec) in scope.queue.iter_mut() {
+                    for (key, mut vec) in &mut scope.queue {
                         while !vec.is_empty() && vec[0].deadline <= now {
                             let mut queued = vec.remove(0);
                             let _ = queued.handler.on_error(::Error::Timeout);
@@ -517,7 +517,7 @@ where C: Connect,
                             match connector.connect(&url) {
                                 Ok(key) => {
                                     let deadline = scope.now() + scope.connect_timeout;
-                                    scope.queue.entry(key).or_insert(Vec::new()).push(Queued {
+                                    scope.queue.entry(key).or_insert_with(Vec::new).push(Queued {
                                         deadline: deadline,
                                         handler: handler,
                                         url: url
diff --git a/src/header/common/accept_ranges.rs b/src/header/common/accept_ranges.rs
@@ -95,7 +95,7 @@ impl Display for RangeUnit {
         match *self {
             RangeUnit::Bytes => f.write_str("bytes"),
             RangeUnit::None => f.write_str("none"),
-            RangeUnit::Unregistered(ref x) => f.write_str(&x),
+            RangeUnit::Unregistered(ref x) => f.write_str(x),
         }
     }
 }
diff --git a/src/header/common/content_range.rs b/src/header/common/content_range.rs
@@ -182,7 +182,7 @@ impl Display for ContentRangeSpec {
             ContentRangeSpec::Unregistered { ref unit, ref resp } => {
                 try!(f.write_str(&unit));
                 try!(f.write_str(" "));
-                f.write_str(&resp)
+                f.write_str(resp)
             }
         }
     }
diff --git a/src/header/common/host.rs b/src/header/common/host.rs
@@ -69,14 +69,10 @@ impl Header for Host {
                 }
             };
 
-            let port = match idx {
-                Some(idx) => s[idx + 1..].parse().ok(),
-                None => None
-            };
+            let port = idx.and_then(|idx| s[idx + 1..].parse().ok());
 
-            match idx {
-                Some(idx) => s.truncate(idx),
-                None => ()
+            if let Some(idx) = idx {
+                s.truncate(idx)
             }
 
             Ok(Host {
diff --git a/src/header/common/prefer.rs b/src/header/common/prefer.rs
@@ -106,7 +106,7 @@ impl fmt::Display for Preference {
             Extension(ref name, ref value, ref params) => {
                 try!(write!(f, "{}", name));
                 if value != "" { try!(write!(f, "={}", value)); }
-                if params.len() > 0 {
+                if !params.is_empty() {
                     for &(ref name, ref value) in params {
                         try!(write!(f, "; {}", name));
                         if value != "" { try!(write!(f, "={}", value)); }
@@ -138,12 +138,12 @@ impl FromStr for Preference {
             Some(param) => {
                 let rest: Vec<(String, String)> = params.map(|(l, r)| (l.to_owned(), r.to_owned())).collect();
                 match param {
-                    ("respond-async", "") => if rest.len() == 0 { Ok(RespondAsync) } else { Err(None) },
-                    ("return", "representation") => if rest.len() == 0 { Ok(ReturnRepresentation) } else { Err(None) },
-                    ("return", "minimal") => if rest.len() == 0 { Ok(ReturnMinimal) } else { Err(None) },
-                    ("handling", "strict") => if rest.len() == 0 { Ok(HandlingStrict) } else { Err(None) },
-                    ("handling", "leniant") => if rest.len() == 0 { Ok(HandlingLeniant) } else { Err(None) },
-                    ("wait", secs) => if rest.len() == 0 { secs.parse().map(Wait).map_err(Some) } else { Err(None) },
+                    ("respond-async", "") => if rest.is_empty() { Ok(RespondAsync) } else { Err(None) },
+                    ("return", "representation") => if rest.is_empty() { Ok(ReturnRepresentation) } else { Err(None) },
+                    ("return", "minimal") => if rest.is_empty() { Ok(ReturnMinimal) } else { Err(None) },
+                    ("handling", "strict") => if rest.is_empty() { Ok(HandlingStrict) } else { Err(None) },
+                    ("handling", "leniant") => if rest.is_empty() { Ok(HandlingLeniant) } else { Err(None) },
+                    ("wait", secs) => if rest.is_empty() { secs.parse().map(Wait).map_err(Some) } else { Err(None) },
                     (left, right) => Ok(Extension(left.to_owned(), right.to_owned(), rest))
                 }
             },
diff --git a/src/header/common/preference_applied.rs b/src/header/common/preference_applied.rs
@@ -71,7 +71,7 @@ impl Header for PreferenceApplied {
               value.to_owned(),
               vec![]
             ),
-            preference @ _ => preference.clone()
+            preference => preference.clone()
         }).collect();
         fmt_comma_delimited(f, &preferences)
     }
diff --git a/src/header/common/range.rs b/src/header/common/range.rs
@@ -126,7 +126,7 @@ impl FromStr for Range {
     type Err = ::Error;
 
     fn from_str(s: &str) -> ::Result<Range> {
-        let mut iter = s.splitn(2, "=");
+        let mut iter = s.splitn(2, '=');
 
         match (iter.next(), iter.next()) {
             (Some("bytes"), Some(ranges)) => {
@@ -153,7 +153,7 @@ impl FromStr for ByteRangeSpec {
     type Err = ::Error;
 
     fn from_str(s: &str) -> ::Result<ByteRangeSpec> {
-        let mut parts = s.splitn(2, "-");
+        let mut parts = s.splitn(2, '-');
 
         match (parts.next(), parts.next()) {
             (Some(""), Some(end)) => {
diff --git a/src/header/mod.rs b/src/header/mod.rs
@@ -143,12 +143,12 @@ impl<T: Header + Clone> HeaderClone for T {
 impl Header + Send + Sync {
     #[inline]
     unsafe fn downcast_ref_unchecked<T: 'static>(&self) -> &T {
-        mem::transmute(traitobject::data(self))
+        &*(traitobject::data(self) as *const T)
     }
 
     #[inline]
     unsafe fn downcast_mut_unchecked<T: 'static>(&mut self) -> &mut T {
-        mem::transmute(traitobject::data_mut(self))
+        &mut *(traitobject::data_mut(self) as *mut T)
     }
 }
 
@@ -497,7 +497,7 @@ impl<'a> fmt::Display for &'a (Header + Send + Sync) {
     }
 }
 
-/// A wrapper around any Header with a Display impl that calls fmt_header.
+/// A wrapper around any Header with a Display impl that calls `fmt_header`.
 ///
 /// This can be used like so: `format!("{}", HeaderFormatter(&header))` to
 /// get the representation of a Header which will be written to an
diff --git a/src/header/parsing.rs b/src/header/parsing.rs
@@ -12,7 +12,7 @@ use header::shared::Charset;
 pub fn from_one_raw_str<T: str::FromStr>(raw: &[Vec<u8>]) -> ::Result<T> {
     if raw.len() != 1 || unsafe { raw.get_unchecked(0) } == b"" { return Err(::Error::Header) }
     // we JUST checked that raw.len() == 1, so raw[0] WILL exist.
-    from_raw_str(& unsafe { raw.get_unchecked(0) })
+    from_raw_str( unsafe { raw.get_unchecked(0) })
 }
 
 /// Reads a raw string into a value.
diff --git a/src/header/shared/charset.rs b/src/header/shared/charset.rs
@@ -91,7 +91,7 @@ impl Charset {
             Gb2312 => "GB2312",
             Big5 => "5",
             Koi8_R => "KOI8-R",
-            Ext(ref s) => &s
+            Ext(ref s) => s
         }
     }
 }
diff --git a/src/header/shared/entity.rs b/src/header/shared/entity.rs
@@ -4,10 +4,10 @@ use std::fmt::{self, Display};
 // check that each char in the slice is either:
 // 1. %x21, or
 // 2. in the range %x23 to %x7E, or
-// 3. in the range %x80 to %xFF
+// 3. above %x80
 fn check_slice_validity(slice: &str) -> bool {
     slice.bytes().all(|c|
-        c == b'\x21' || (c >= b'\x23' && c <= b'\x7e') | (c >= b'\x80' && c <= b'\xff'))
+        c == b'\x21' || (c >= b'\x23' && c <= b'\x7e') | (c >= b'\x80'))
 }
 
 /// An entity tag, defined in [RFC7232](https://tools.ietf.org/html/rfc7232#section-2.3)
diff --git a/src/http/buffer.rs b/src/http/buffer.rs
@@ -6,7 +6,7 @@ use std::ptr;
 const INIT_BUFFER_SIZE: usize = 4096;
 const MAX_BUFFER_SIZE: usize = 8192 + 4096 * 100;
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Buffer {
     vec: Vec<u8>,
     read_pos: usize,
@@ -15,11 +15,7 @@ pub struct Buffer {
 
 impl Buffer {
     pub fn new() -> Buffer {
-        Buffer {
-            vec: Vec::new(),
-            read_pos: 0,
-            write_pos: 0,
-        }
+        Buffer::default()
     }
 
     pub fn reset(&mut self) {
diff --git a/src/http/conn.rs b/src/http/conn.rs
@@ -508,22 +508,17 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> Conn<K, T, H> {
             },
             Err(e) => {
                 trace!("error reregistering: {:?}", e);
-                let _ = self.on_error(e.into());
+                self.on_error(e.into());
                 None
             }
         }
     }
 
     pub fn wakeup<F>(mut self, scope: &mut Scope<F>) -> Option<(Self, Option<Duration>)>
     where F: MessageHandlerFactory<K, T, Output=H> {
-        loop {
-            match self.ctrl.1.try_recv() {
-                Ok(next) => {
-                    trace!("woke up with {:?}", next);
-                    self.state.update(next);
-                },
-                Err(_) => break
-            }
+        while let Ok(next) = self.ctrl.1.try_recv() {
+            trace!("woke up with {:?}", next);
+            self.state.update(next);
         }
         self.ready(EventSet::readable() | EventSet::writable(), scope)
     }
@@ -872,7 +867,7 @@ impl<'a, K: Key + 'a> Seed<'a, K> {
     }
 
     pub fn key(&self) -> &K {
-        &self.0
+        self.0
     }
 }
 
diff --git a/src/server/message.rs b/src/server/message.rs
@@ -6,10 +6,10 @@ use net::Transport;
 
 use super::{Handler, request, response};
 
-/// A MessageHandler for a Server.
+/// A `MessageHandler` for a Server.
 ///
-/// This should be really thin glue between http::MessageHandler and
-/// server::Handler, but largely just providing the proper types one
+/// This should be really thin glue between `http::MessageHandler` and
+/// `server::Handler`, but largely just providing the proper types one
 /// would expect in a Server Handler.
 pub struct Message<H: Handler<T>, T: Transport> {
     handler: H,
@@ -55,4 +55,3 @@ impl<H: Handler<T>, T: Transport> http::MessageHandler<T> for Message<H, T> {
         self.handler.on_remove(transport);
     }
 }
-
diff --git a/src/server/response.rs b/src/server/response.rs
@@ -43,7 +43,7 @@ impl<'a> Response<'a> {
 }
 
 /// Creates a new Response that can be used to write to a network stream.
-pub fn new<'a>(head: &'a mut http::MessageHead<StatusCode>) -> Response<'a> {
+pub fn new(head: &mut http::MessageHead<StatusCode>) -> Response {
     Response {
         head: head
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl Display for RangeUnit {`
`95`	`95`	`match *self {`
`96`	`96`	`RangeUnit::Bytes => f.write_str("bytes"),`
`97`	`97`	`RangeUnit::None => f.write_str("none"),`
`98`		`- RangeUnit::Unregistered(ref x) => f.write_str(&x),`
	`98`	`+ RangeUnit::Unregistered(ref x) => f.write_str(x),`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ impl Display for ContentRangeSpec {`
`182`	`182`	`ContentRangeSpec::Unregistered { ref unit, ref resp } => {`
`183`	`183`	`try!(f.write_str(&unit));`
`184`	`184`	`try!(f.write_str(" "));`
`185`		`- f.write_str(&resp)`
	`185`	`+ f.write_str(resp)`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ impl Header for PreferenceApplied {`
`71`	`71`	`value.to_owned(),`
`72`	`72`	`vec![]`
`73`	`73`	`),`
`74`		`- preference @ _ => preference.clone()`
	`74`	`+ preference => preference.clone()`
`75`	`75`	`}).collect();`
`76`	`76`	`fmt_comma_delimited(f, &preferences)`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,12 +143,12 @@ impl<T: Header + Clone> HeaderClone for T {`
`143`	`143`	`impl Header + Send + Sync {`
`144`	`144`	`#[inline]`
`145`	`145`	`unsafe fn downcast_ref_unchecked<T: 'static>(&self) -> &T {`
`146`		`- mem::transmute(traitobject::data(self))`
	`146`	`+ &(traitobject::data(self) as const T)`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`#[inline]`
`150`	`150`	`unsafe fn downcast_mut_unchecked<T: 'static>(&mut self) -> &mut T {`
`151`		`- mem::transmute(traitobject::data_mut(self))`
	`151`	`+ &mut (traitobject::data_mut(self) as mut T)`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`@@ -497,7 +497,7 @@ impl<'a> fmt::Display for &'a (Header + Send + Sync) {`
`497`	`497`	`}`
`498`	`498`	`}`
`499`	`499`
`500`		`-/// A wrapper around any Header with a Display impl that calls fmt_header.`
	`500`	+/// A wrapper around any Header with a Display impl that calls `fmt_header`.
`501`	`501`	`///`
`502`	`502`	/// This can be used like so: `format!("{}", HeaderFormatter(&header))` to
`503`	`503`	`/// get the representation of a Header which will be written to an`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ use header::shared::Charset;`
`12`	`12`	`pub fn from_one_raw_str<T: str::FromStr>(raw: &[Vec<u8>]) -> ::Result<T> {`
`13`	`13`	`if raw.len() != 1 \|\| unsafe { raw.get_unchecked(0) } == b"" { return Err(::Error::Header) }`
`14`	`14`	`// we JUST checked that raw.len() == 1, so raw[0] WILL exist.`
`15`		`- from_raw_str(& unsafe { raw.get_unchecked(0) })`
	`15`	`+ from_raw_str( unsafe { raw.get_unchecked(0) })`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/// Reads a raw string into a value.`