Skip to content

Commit

Permalink
feat(body): remove Body::is_empty()
Browse files Browse the repository at this point in the history
BREAKING CHANGE: `Body::is_empty()` is gone. Replace with
  `Body::is_end_stream()`, from the `Payload` trait.
  • Loading branch information
seanmonstar committed May 30, 2018
1 parent 2051d5c commit 19f9024
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
18 changes: 0 additions & 18 deletions src/body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,24 +224,6 @@ impl Body {
Body::new(Kind::Wrapped(Box::new(mapped)))
}

/// Returns if this body was constructed via `Body::empty()`.
///
/// # Note
///
/// This does **not** detect if the body stream may be at the end, or
/// if the stream will not yield any chunks, in all cases. For instance,
/// a streaming body using `chunked` encoding is not able to tell if
/// there are more chunks immediately.
///
/// See [`is_end_stream`](Payload::is_end_stream) for a dynamic version.
#[inline]
pub fn is_empty(&self) -> bool {
match self.kind {
Kind::Empty => true,
_ => false,
}
}

fn new(kind: Kind) -> Body {
Body {
kind: kind,
Expand Down
2 changes: 1 addition & 1 deletion src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ where C: Connect + Sync + 'static,
// It won't be ready if there is a body to stream.
if ver == Ver::Http2 || !pooled.is_pool_enabled() || pooled.is_ready() {
drop(pooled);
} else if !res.body().is_empty() {
} else if !res.body().is_end_stream() {
let (delayed_tx, delayed_rx) = oneshot::channel();
res.body_mut().delayed_eof(delayed_rx);
executor.execute(
Expand Down

0 comments on commit 19f9024

Please sign in to comment.