Skip to content

Commit

Permalink
Fix merge goof
Browse files Browse the repository at this point in the history
  • Loading branch information
sagebind committed Jan 12, 2021
1 parent 7ee6569 commit 1efdc56
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cookies/psl/list
Submodule list updated 1 files
+60 −19 public_suffix_list.dat
3 changes: 1 addition & 2 deletions src/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ pub trait AsyncReadResponseExt<R: AsyncRead + Unpin> {
fn text(&mut self) -> crate::text::TextFuture<'_, &mut R>;
}


impl<R: AsyncRead + Unpin> AsyncReadResponseExt<R> for Response<R> {
fn consume(&mut self) -> ConsumeFuture<'_, R> {
ConsumeFuture::new(async move {
Expand All @@ -375,7 +374,7 @@ impl<R: AsyncRead + Unpin> AsyncReadResponseExt<R> for Response<R> {
decl_future! {
/// A future which reads any remaining bytes from the response body stream
/// and discard them.
pub type ConsumeFuture<T> = impl Future<Output = io::Result<()>> + SendIf<T>;
pub type ConsumeFuture<R> = impl Future<Output = io::Result<()>> + SendIf<R>;

/// A future which copies all the response body bytes into a sink.
pub type CopyFuture<R, W> = impl Future<Output = io::Result<u64>> + SendIf<R, W>;
Expand Down

0 comments on commit 1efdc56

Please sign in to comment.