berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

fix clippy warning

This commit is contained in:
fakeshadow 2021-04-24 01:07:02 +08:00
parent 9eb371101c
commit f0501d53d3
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actix-server/src/accept.rs
View File

@ -179,7 +179,7 @@ impl Accept {
Accept::new_with_sockets(poll, waker_rx, socks, handles, srv); Accept::new_with_sockets(poll, waker_rx, socks, handles, srv);
// Construct Context from waker. // Construct Context from waker.
let waker = waker::from_registry(accept.poll.registry()).unwrap().into(); let waker = waker::from_registry(accept.poll.registry()).unwrap();
let cx = &mut Context::from_waker(&waker); let cx = &mut Context::from_waker(&waker);
accept.poll_with(&mut sockets, cx); accept.poll_with(&mut sockets, cx);
@ -272,9 +272,9 @@ impl Accept {
// This is a loop because interests for command from previous version was // This is a loop because interests for command from previous version was
// a loop that would try to drain the command channel. It's yet unknown // a loop that would try to drain the command channel. It's yet unknown
// if it's necessary/good practice to actively drain the waker queue. // if it's necessary/good practice to actively drain the waker queue.
while let task::Poll::Ready(Some(msg)) = self.waker_rx.poll_recv(cx) { while let task::Poll::Ready(msg) = self.waker_rx.poll_recv(cx) {
match msg { match msg {
WakerInterest::WorkerAvailable(idx) => { Some(WakerInterest::WorkerAvailable(idx)) => {
self.avail.set_available(idx, true); self.avail.set_available(idx, true);
if !self.paused { if !self.paused {
@ -282,7 +282,7 @@ impl Accept {
} }
} }
// a new worker thread is made and it's handle would be added to Accept // a new worker thread is made and it's handle would be added to Accept
WakerInterest::Worker(handle) => { Some(WakerInterest::Worker(handle)) => {
self.avail.set_available(handle.idx(), true); self.avail.set_available(handle.idx(), true);
self.handles.push(handle); self.handles.push(handle);
@ -290,13 +290,13 @@ impl Accept {
self.accept_all(sockets); self.accept_all(sockets);
} }
} }
WakerInterest::Pause => { Some(WakerInterest::Pause) => {
if !self.paused { if !self.paused {
self.paused = true; self.paused = true;
self.deregister_all(sockets); self.deregister_all(sockets);
} }
} }
WakerInterest::Resume => { Some(WakerInterest::Resume) => {
if self.paused { if self.paused {
self.paused = false; self.paused = false;
@ -307,7 +307,7 @@ impl Accept {
self.accept_all(sockets); self.accept_all(sockets);
} }
} }
WakerInterest::Stop => { Some(WakerInterest::Stop) | None => {
if !self.paused { if !self.paused {
self.deregister_all(sockets); self.deregister_all(sockets);
} }

3
actix-server/src/waker.rs
View File

@ -29,6 +29,7 @@ pub(crate) enum WakerInterest {
/// `WorkerHandleAccept`. /// `WorkerHandleAccept`.
Worker(WorkerHandleAccept), Worker(WorkerHandleAccept),
} }
/// Wrapper type for mio::Waker in order to impl std::task::Wake trait. /// Wrapper type for mio::Waker in order to impl std::task::Wake trait.
struct _Waker(mio::Waker); struct _Waker(mio::Waker);
@ -54,7 +55,7 @@ impl Clone for WakerTx {
} }
impl WakerTx { impl WakerTx {
/// Send WakerInterest through channel and panic on error. /// Send WakerInterest through channel and panic on error(shutdown).
pub(crate) fn wake(&self, interest: WakerInterest) { pub(crate) fn wake(&self, interest: WakerInterest) {
self.0 self.0
.send(interest) .send(interest)