Skip to content

Commit e100e60

Browse files
leoyvensleoyvens
committed
Clippy run
1 parent 0c847f7 commit e100e60

17 files changed

+51
-81
lines changed

‎src/client/connect.rs

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl Connect for HttpConnector {
8888
if let Some(key) = self.key(url) {
8989
let host = url.host_str().expect("http scheme must have a host");
9090
self.dns.as_ref().expect("dns workers lost").resolve(host);
91-
self.resolving.entry(host.to_owned()).or_insert(Vec::new()).push(key.clone());
91+
self.resolving.entry(host.to_owned()).or_insert_with(Vec::new).push(key.clone());
9292
Ok(key)
9393
} else {
9494
Err(io::Error::new(io::ErrorKind::InvalidInput, "scheme must be http"))
@@ -101,25 +101,18 @@ impl Connect for HttpConnector {
101101
Err(_) => return None
102102
};
103103
debug!("Http::resolved <- ({:?}, {:?})", host, addr);
104-
match self.resolving.entry(host) {
105-
Entry::Occupied(mut entry) => {
106-
let resolved = entry.get_mut().remove(0);
107-
if entry.get().is_empty() {
108-
entry.remove();
109-
}
110-
let port = resolved.2;
111-
match addr {
112-
Ok(addr) => {
113-
Some((resolved, TcpStream::connect(&SocketAddr::new(addr, port))
114-
.map(HttpStream)))
115-
},
116-
Err(e) => Some((resolved, Err(e)))
117-
}
118-
}
119-
_ => {
120-
trace!("^-- resolved but not in hashmap?");
121-
return None
104+
if let Entry::Occupied(mut entry) = self.resolving.entry(host) {
105+
let resolved = entry.get_mut().remove(0);
106+
if entry.get().is_empty() {
107+
entry.remove();
122108
}
109+
let port = resolved.2;
110+
Some((resolved, addr.and_then(|addr| TcpStream::connect(&SocketAddr::new(addr, port))
111+
.map(HttpStream))
112+
))
113+
} else {
114+
trace!("^-- resolved but not in hashmap?");
115+
None
123116
}
124117
}
125118

@@ -167,7 +160,7 @@ impl<S: SslClient> Connect for HttpsConnector<S> {
167160
if let Some(key) = self.key(url) {
168161
let host = url.host_str().expect("http scheme must have a host");
169162
self.http.dns.as_ref().expect("dns workers lost").resolve(host);
170-
self.http.resolving.entry(host.to_owned()).or_insert(Vec::new()).push(key.clone());
163+
self.http.resolving.entry(host.to_owned()).or_insert_with(Vec::new).push(key.clone());
171164
Ok(key)
172165
} else {
173166
Err(io::Error::new(io::ErrorKind::InvalidInput, "scheme must be http or https"))

‎src/client/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ impl<H> Client<H> {
6767

6868
/*TODO
6969
pub fn http() -> Config<HttpConnector> {
70-
70+
7171
}
7272
7373
pub fn https() -> Config<HttpsConnector> {
74-
74+
7575
}
7676
*/
7777
}
@@ -440,7 +440,7 @@ where C: Connect,
440440
let now = scope.now();
441441
let mut empty_keys = Vec::new();
442442
{
443-
for (key, mut vec) in scope.queue.iter_mut() {
443+
for (key, mut vec) in &mut scope.queue {
444444
while !vec.is_empty() && vec[0].deadline <= now {
445445
let mut queued = vec.remove(0);
446446
let _ = queued.handler.on_error(::Error::Timeout);
@@ -517,7 +517,7 @@ where C: Connect,
517517
match connector.connect(&url) {
518518
Ok(key) => {
519519
let deadline = scope.now() + scope.connect_timeout;
520-
scope.queue.entry(key).or_insert(Vec::new()).push(Queued {
520+
scope.queue.entry(key).or_insert_with(Vec::new).push(Queued {
521521
deadline: deadline,
522522
handler: handler,
523523
url: url

‎src/header/common/accept_ranges.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl Display for RangeUnit {
9595
match *self {
9696
RangeUnit::Bytes => f.write_str("bytes"),
9797
RangeUnit::None => f.write_str("none"),
98-
RangeUnit::Unregistered(ref x) => f.write_str(&x),
98+
RangeUnit::Unregistered(ref x) => f.write_str(x),
9999
}
100100
}
101101
}

‎src/header/common/content_range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl Display for ContentRangeSpec {
182182
ContentRangeSpec::Unregistered { ref unit, ref resp } => {
183183
try!(f.write_str(&unit));
184184
try!(f.write_str(" "));
185-
f.write_str(&resp)
185+
f.write_str(resp)
186186
}
187187
}
188188
}

‎src/header/common/host.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,10 @@ impl Header for Host {
6969
}
7070
};
7171

72-
let port = match idx {
73-
Some(idx) => s[idx + 1..].parse().ok(),
74-
None => None
75-
};
72+
let port = idx.and_then(|idx| s[idx + 1..].parse().ok());
7673

77-
match idx {
78-
Some(idx) => s.truncate(idx),
79-
None => ()
74+
if let Some(idx) = idx {
75+
s.truncate(idx)
8076
}
8177

8278
Ok(Host {

‎src/header/common/prefer.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl fmt::Display for Preference {
106106
Extension(ref name, ref value, ref params) => {
107107
try!(write!(f, "{}", name));
108108
if value != "" { try!(write!(f, "={}", value)); }
109-
if params.len() > 0 {
109+
if !params.is_empty() {
110110
for &(ref name, ref value) in params {
111111
try!(write!(f, "; {}", name));
112112
if value != "" { try!(write!(f, "={}", value)); }
@@ -138,12 +138,12 @@ impl FromStr for Preference {
138138
Some(param) => {
139139
let rest: Vec<(String, String)> = params.map(|(l, r)| (l.to_owned(), r.to_owned())).collect();
140140
match param {
141-
("respond-async", "") => if rest.len() == 0 { Ok(RespondAsync) } else { Err(None) },
142-
("return", "representation") => if rest.len() == 0 { Ok(ReturnRepresentation) } else { Err(None) },
143-
("return", "minimal") => if rest.len() == 0 { Ok(ReturnMinimal) } else { Err(None) },
144-
("handling", "strict") => if rest.len() == 0 { Ok(HandlingStrict) } else { Err(None) },
145-
("handling", "leniant") => if rest.len() == 0 { Ok(HandlingLeniant) } else { Err(None) },
146-
("wait", secs) => if rest.len() == 0 { secs.parse().map(Wait).map_err(Some) } else { Err(None) },
141+
("respond-async", "") => if rest.is_empty() { Ok(RespondAsync) } else { Err(None) },
142+
("return", "representation") => if rest.is_empty() { Ok(ReturnRepresentation) } else { Err(None) },
143+
("return", "minimal") => if rest.is_empty() { Ok(ReturnMinimal) } else { Err(None) },
144+
("handling", "strict") => if rest.is_empty() { Ok(HandlingStrict) } else { Err(None) },
145+
("handling", "leniant") => if rest.is_empty() { Ok(HandlingLeniant) } else { Err(None) },
146+
("wait", secs) => if rest.is_empty() { secs.parse().map(Wait).map_err(Some) } else { Err(None) },
147147
(left, right) => Ok(Extension(left.to_owned(), right.to_owned(), rest))
148148
}
149149
},

‎src/header/common/preference_applied.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl Header for PreferenceApplied {
7171
value.to_owned(),
7272
vec![]
7373
),
74-
preference @ _ => preference.clone()
74+
preference => preference.clone()
7575
}).collect();
7676
fmt_comma_delimited(f, &preferences)
7777
}

‎src/header/common/range.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl FromStr for Range {
126126
type Err = ::Error;
127127

128128
fn from_str(s: &str) -> ::Result<Range> {
129-
let mut iter = s.splitn(2, "=");
129+
let mut iter = s.splitn(2, '=');
130130

131131
match (iter.next(), iter.next()) {
132132
(Some("bytes"), Some(ranges)) => {
@@ -153,7 +153,7 @@ impl FromStr for ByteRangeSpec {
153153
type Err = ::Error;
154154

155155
fn from_str(s: &str) -> ::Result<ByteRangeSpec> {
156-
let mut parts = s.splitn(2, "-");
156+
let mut parts = s.splitn(2, '-');
157157

158158
match (parts.next(), parts.next()) {
159159
(Some(""), Some(end)) => {

‎src/header/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ impl<T: Header + Clone> HeaderClone for T {
143143
impl Header + Send + Sync {
144144
#[inline]
145145
unsafe fn downcast_ref_unchecked<T: 'static>(&self) -> &T {
146-
mem::transmute(traitobject::data(self))
146+
&*(traitobject::data(self) as *const T)
147147
}
148148

149149
#[inline]
150150
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)
152152
}
153153
}
154154

@@ -497,7 +497,7 @@ impl<'a> fmt::Display for &'a (Header + Send + Sync) {
497497
}
498498
}
499499

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`.
501501
///
502502
/// This can be used like so: `format!("{}", HeaderFormatter(&header))` to
503503
/// get the representation of a Header which will be written to an

‎src/header/parsing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use header::shared::Charset;
1212
pub fn from_one_raw_str<T: str::FromStr>(raw: &[Vec<u8>]) -> ::Result<T> {
1313
if raw.len() != 1 || unsafe { raw.get_unchecked(0) } == b"" { return Err(::Error::Header) }
1414
// 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) })
1616
}
1717

1818
/// Reads a raw string into a value.

‎src/header/shared/charset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl Charset {
9191
Gb2312 => "GB2312",
9292
Big5 => "5",
9393
Koi8_R => "KOI8-R",
94-
Ext(ref s) => &s
94+
Ext(ref s) => s
9595
}
9696
}
9797
}

‎src/header/shared/entity.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ use std::fmt::{self, Display};
44
// check that each char in the slice is either:
55
// 1. %x21, or
66
// 2. in the range %x23 to %x7E, or
7-
// 3. in the range %x80 to %xFF
7+
// 3. above %x80
88
fn check_slice_validity(slice: &str) -> bool {
99
slice.bytes().all(|c|
10-
c == b'\x21' || (c >= b'\x23' && c <= b'\x7e') | (c >= b'\x80' && c <= b'\xff'))
10+
c == b'\x21' || (c >= b'\x23' && c <= b'\x7e') | (c >= b'\x80'))
1111
}
1212

1313
/// An entity tag, defined in [RFC7232](https://tools.ietf.org/html/rfc7232#section-2.3)

‎src/http/buffer.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ptr;
66
const INIT_BUFFER_SIZE: usize = 4096;
77
const MAX_BUFFER_SIZE: usize = 8192 + 4096 * 100;
88

9-
#[derive(Debug)]
9+
#[derive(Debug, Default)]
1010
pub struct Buffer {
1111
vec: Vec<u8>,
1212
read_pos: usize,
@@ -15,11 +15,7 @@ pub struct Buffer {
1515

1616
impl Buffer {
1717
pub fn new() -> Buffer {
18-
Buffer {
19-
vec: Vec::new(),
20-
read_pos: 0,
21-
write_pos: 0,
22-
}
18+
Buffer::default()
2319
}
2420

2521
pub fn reset(&mut self) {

‎src/http/conn.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -508,22 +508,17 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> Conn<K, T, H> {
508508
},
509509
Err(e) => {
510510
trace!("error reregistering: {:?}", e);
511-
let _ = self.on_error(e.into());
511+
self.on_error(e.into());
512512
None
513513
}
514514
}
515515
}
516516

517517
pub fn wakeup<F>(mut self, scope: &mut Scope<F>) -> Option<(Self, Option<Duration>)>
518518
where F: MessageHandlerFactory<K, T, Output=H> {
519-
loop {
520-
match self.ctrl.1.try_recv() {
521-
Ok(next) => {
522-
trace!("woke up with {:?}", next);
523-
self.state.update(next);
524-
},
525-
Err(_) => break
526-
}
519+
while let Ok(next) = self.ctrl.1.try_recv() {
520+
trace!("woke up with {:?}", next);
521+
self.state.update(next);
527522
}
528523
self.ready(EventSet::readable() | EventSet::writable(), scope)
529524
}
@@ -872,7 +867,7 @@ impl<'a, K: Key + 'a> Seed<'a, K> {
872867
}
873868

874869
pub fn key(&self) -> &K {
875-
&self.0
870+
self.0
876871
}
877872
}
878873

‎src/server/message.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use net::Transport;
66

77
use super::{Handler, request, response};
88

9-
/// A MessageHandler for a Server.
9+
/// A `MessageHandler` for a Server.
1010
///
11-
/// This should be really thin glue between http::MessageHandler and
12-
/// server::Handler, but largely just providing the proper types one
11+
/// This should be really thin glue between `http::MessageHandler` and
12+
/// `server::Handler`, but largely just providing the proper types one
1313
/// would expect in a Server Handler.
1414
pub struct Message<H: Handler<T>, T: Transport> {
1515
handler: H,
@@ -55,4 +55,3 @@ impl<H: Handler<T>, T: Transport> http::MessageHandler<T> for Message<H, T> {
5555
self.handler.on_remove(transport);
5656
}
5757
}
58-

‎src/server/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl<'a> Response<'a> {
4343
}
4444

4545
/// Creates a new Response that can be used to write to a network stream.
46-
pub fn new<'a>(head: &'a mut http::MessageHead<StatusCode>) -> Response<'a> {
46+
pub fn new(head: &mut http::MessageHead<StatusCode>) -> Response {
4747
Response {
4848
head: head
4949
}

‎src/status.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use std::cmp::Ordering;
2828
/// Registry](http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml) which is
2929
/// the source for this enum (with one exception, 418 I'm a teapot, which is
3030
/// inexplicably not in the register).
31-
#[derive(Debug, Hash)]
31+
#[derive(Debug, Hash, Copy, Clone)]
3232
pub enum StatusCode {
3333
/// 100 Continue
3434
/// [[RFC7231, Section 6.2.1](https://tools.ietf.org/html/rfc7231#section-6.2.1)]
@@ -494,8 +494,6 @@ impl StatusCode {
494494
}
495495
}
496496

497-
impl Copy for StatusCode {}
498-
499497
/// Formats the status code, *including* the canonical reason.
500498
///
501499
/// ```rust
@@ -520,13 +518,6 @@ impl PartialEq for StatusCode {
520518

521519
impl Eq for StatusCode {}
522520

523-
impl Clone for StatusCode {
524-
#[inline]
525-
fn clone(&self) -> StatusCode {
526-
*self
527-
}
528-
}
529-
530521
impl PartialOrd for StatusCode {
531522
#[inline]
532523
fn partial_cmp(&self, other: &StatusCode) -> Option<Ordering> {

0 commit comments

Comments
 (0)