forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(multiple): Clippy run

Browse Source
This commit is contained in:
leonardo.yvens
2016-06-04 11:21:53 -03:00
parent 0c847f7898
commit d4a095d75c
16 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/client/connect.rs
View File

@@ -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"))

8
src/client/mod.rs
View File

@@ -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