From 162986ed8c2c5635039f4a50e4bc0250e2cc0979 Mon Sep 17 00:00:00 2001 From: Atkins Date: Tue, 3 Sep 2019 20:38:43 +0800 Subject: [PATCH 1/2] style(common): remove `FutureExt::boxed` to unify project style --- src/common/drain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/drain.rs b/src/common/drain.rs index 31ea926700..95eaaaeb16 100644 --- a/src/common/drain.rs +++ b/src/common/drain.rs @@ -1,9 +1,9 @@ use std::mem; +use futures_util::FutureExt as _; use tokio_sync::{mpsc, watch}; use super::{Future, Never, Poll, Pin, task}; -use futures_util::FutureExt as _; // Sentinel value signaling that the watch is still open enum Action { @@ -100,9 +100,10 @@ where loop { match mem::replace(&mut me.state, State::Draining) { State::Watch(on_drain) => { - let mut recv_fut = me.watch.rx.recv_ref().boxed(); + let recv = me.watch.rx.recv_ref(); + futures_util::pin_mut!(recv); - match recv_fut.poll_unpin(cx) { + match recv.poll_unpin(cx) { Poll::Ready(None) => { // Drain has been triggered! on_drain(unsafe { Pin::new_unchecked(&mut me.future) }); From f6e6177d5434efbb63960fe4e696bdb25740b6f0 Mon Sep 17 00:00:00 2001 From: Atkins Date: Tue, 3 Sep 2019 20:41:36 +0800 Subject: [PATCH 2/2] style(server): remove `FutureExt::boxed` to unify project style --- src/server/tcp.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/tcp.rs b/src/server/tcp.rs index de02b54700..47e064d746 100644 --- a/src/server/tcp.rs +++ b/src/server/tcp.rs @@ -106,10 +106,11 @@ impl AddrIncoming { } self.timeout = None; - let mut accept_fut = self.listener.accept().boxed(); + let accept = self.listener.accept(); + futures_util::pin_mut!(accept); loop { - match accept_fut.poll_unpin(cx) { + match accept.poll_unpin(cx) { Poll::Ready(Ok((socket, addr))) => { if let Some(dur) = self.tcp_keepalive_timeout { if let Err(e) = socket.set_keepalive(Some(dur)) {