Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ checked_conversions = "allow"
else_if_without_else = "allow"
enum_glob_use = "allow"
float_arithmetic = "allow"
ignored_unit_patterns = "allow"
indexing_slicing = "allow"
integer_division = "allow"
integer_division_remainder_used = "allow"
Expand Down
8 changes: 4 additions & 4 deletions src/client/dispatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl<T, U> Sender<T, U> {
let (tx, rx) = oneshot::channel();
self.inner
.send(Envelope(Some((val, Callback::Retry(Some(tx))))))
.map(move |_| rx)
.map(move |()| rx)
.map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
}

Expand All @@ -123,7 +123,7 @@ impl<T, U> Sender<T, U> {
let (tx, rx) = oneshot::channel();
self.inner
.send(Envelope(Some((val, Callback::NoRetry(Some(tx))))))
.map(move |_| rx)
.map(move |()| rx)
.map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
}

Expand All @@ -150,15 +150,15 @@ impl<T, U> UnboundedSender<T, U> {
let (tx, rx) = oneshot::channel();
self.inner
.send(Envelope(Some((val, Callback::Retry(Some(tx))))))
.map(move |_| rx)
.map(move |()| rx)
.map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
}

pub(crate) fn send(&mut self, val: T) -> Result<Promise<U>, T> {
let (tx, rx) = oneshot::channel();
self.inner
.send(Envelope(Some((val, Callback::NoRetry(Some(tx))))))
.map(move |_| rx)
.map(move |()| rx)
.map_err(|mut e| (e.0).0.take().expect("envelope not dropped").0)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/proto/h1/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ where
let dst = unsafe { self.read_buf.chunk_mut().as_uninit_slice_mut() };
let mut buf = ReadBuf::uninit(dst);
match Pin::new(&mut self.io).poll_read(cx, buf.unfilled()) {
Poll::Ready(Ok(_)) => {
Poll::Ready(Ok(())) => {
let n = buf.filled().len();
trace!("received {} bytes", n);
// Safety: we just read that many bytes into the
Expand Down
Loading