1
0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 19:47:43 +02:00

Fix code style (#65)

* Fix clippy warnings

* cargo fmt

* Remove redundant lifetime
This commit is contained in:
Yuki Okushi
2019-11-15 00:28:29 +09:00
committed by GitHub
parent 13049b80ca
commit be7904fd57
14 changed files with 24 additions and 25 deletions

View File

@ -221,7 +221,7 @@ where
}
TransportState::Error(err) => {
let is_empty = framed.is_write_buf_empty();
if is_empty || (poll_write(cx, state, framed, rx, inner) || is_empty) {
if is_empty || poll_write(cx, state, framed, rx, inner) {
Poll::Ready(Err(err))
} else {
*state = TransportState::Error(err);

View File

@ -133,8 +133,7 @@ impl<T> Receiver<T> {
let items = match self.state {
State::Open(ref state) => {
let mut state = state.borrow_mut();
let items = mem::replace(&mut state.buffer, VecDeque::new());
items
mem::replace(&mut state.buffer, VecDeque::new())
}
State::Closed(_) => return,
};

View File

@ -135,7 +135,7 @@ impl<T> Sender<T> {
/// non-futures related thread, though, which would otherwise panic if
/// `poll_cancel` were called.
pub fn is_canceled(&self) -> bool {
!self.inner.upgrade().is_some()
self.inner.upgrade().is_none()
}
}
@ -166,7 +166,7 @@ impl<T> Receiver<T> {
self.state = State::Closed(value);
}
State::Closed(_) => return,
State::Closed(_) => {}
};
}
}
@ -180,7 +180,7 @@ impl<T> Future for Receiver<T> {
let inner = match this.state {
State::Open(ref mut inner) => inner,
State::Closed(ref mut item) => match item.take() {
Some(item) => return Poll::Ready(Ok(item.into())),
Some(item) => return Poll::Ready(Ok(item)),
None => return Poll::Ready(Err(Canceled)),
},
};