refactor(lib): fix remaining lint warnings (besides tests)

This commit is contained in:
Sean McArthur
2019-08-22 13:57:50 -07:00
parent 7b1d6d71b7
commit 49b12c415d
4 changed files with 9 additions and 29 deletions

View File

@@ -137,7 +137,7 @@ impl GaiResolver {
drop(pool) drop(pool)
}); });
tx.spawn(on_shutdown); tx.spawn(on_shutdown).expect("can spawn on self");
GaiResolver { GaiResolver {
tx, tx,
@@ -155,7 +155,7 @@ impl Resolve for GaiResolver {
self.tx.spawn(GaiBlocking { self.tx.spawn(GaiBlocking {
host: name.host, host: name.host,
tx: Some(tx), tx: Some(tx),
}); }).expect("spawn GaiBlocking");
GaiFuture { GaiFuture {
rx, rx,
_threadpool_keep_alive: self._threadpool_keep_alive.clone(), _threadpool_keep_alive: self._threadpool_keep_alive.clone(),
@@ -225,9 +225,7 @@ impl Future for GaiBlocking {
return Poll::Ready(()); return Poll::Ready(());
} }
debug!("resolving host={:?}", self.host); let res = self.block();
let res = (&*self.host, 0).to_socket_addrs()
.map(|i| IpAddrs { iter: i });
let tx = self.tx.take().expect("polled after complete"); let tx = self.tx.take().expect("polled after complete");
let _ = tx.send(res); let _ = tx.send(res);

View File

@@ -18,7 +18,7 @@ pub fn channel() -> (Signal, Watch) {
( (
Signal { Signal {
drained_rx, drained_rx,
tx, _tx: tx,
}, },
Watch { Watch {
drained_tx, drained_tx,
@@ -29,7 +29,7 @@ pub fn channel() -> (Signal, Watch) {
pub struct Signal { pub struct Signal {
drained_rx: mpsc::Receiver<Never>, drained_rx: mpsc::Receiver<Never>,
tx: watch::Sender<Action>, _tx: watch::Sender<Action>,
} }
pub struct Draining { pub struct Draining {

View File

@@ -2,9 +2,8 @@
#![deny(missing_docs)] #![deny(missing_docs)]
#![deny(missing_debug_implementations)] #![deny(missing_debug_implementations)]
#![deny(rust_2018_idioms)] #![deny(rust_2018_idioms)]
// XXX NOOOOOOOO // TODO: re-enable denial when all lib tests are re-enabled.
//#![cfg_attr(test, deny(warnings))] //#![cfg_attr(test, deny(warnings))]
#![allow(warnings)]
#![cfg_attr(all(test, feature = "nightly"), feature(test))] #![cfg_attr(all(test, feature = "nightly"), feature(test))]
//! # hyper //! # hyper

View File

@@ -100,23 +100,6 @@ where
T::update_date(); T::update_date();
ready!(self.poll_loop(cx))?; ready!(self.poll_loop(cx))?;
loop {
self.poll_read(cx)?;
self.poll_write(cx)?;
self.poll_flush(cx)?;
// This could happen if reading paused before blocking on IO,
// such as getting to the end of a framed message, but then
// writing/flushing set the state back to Init. In that case,
// if the read buffer still had bytes, we'd want to try poll_read
// again, or else we wouldn't ever be woken up again.
//
// Using this instead of task::current() and notify() inside
// the Conn is noticeably faster in pipelined benchmarks.
if !self.conn.wants_read_again() {
break;
}
}
if self.is_done() { if self.is_done() {
if let Some(pending) = self.conn.pending_upgrade() { if let Some(pending) = self.conn.pending_upgrade() {
@@ -139,9 +122,9 @@ where
// 16 was chosen arbitrarily, as that is number of pipelined requests // 16 was chosen arbitrarily, as that is number of pipelined requests
// benchmarks often use. Perhaps it should be a config option instead. // benchmarks often use. Perhaps it should be a config option instead.
for _ in 0..16 { for _ in 0..16 {
self.poll_read(cx)?; let _ = self.poll_read(cx)?;
self.poll_write(cx)?; let _ = self.poll_write(cx)?;
self.poll_flush(cx)?; let _ = self.poll_flush(cx)?;
// This could happen if reading paused before blocking on IO, // This could happen if reading paused before blocking on IO,
// such as getting to the end of a framed message, but then // such as getting to the end of a framed message, but then