future proof: apply fixes for github.com/rust-lang/rust-clippy/pull/9476

Xaeroxe · Xaeroxe · commit eb939b98e801 · 2022-09-14T00:45:25.000-06:00
diff --git a/futures-util/src/stream/stream/chunks.rs b/futures-util/src/stream/stream/chunks.rs
@@ -77,7 +77,7 @@ impl<St: Stream> Stream for Chunks<St> {
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let chunk_len = if self.items.is_empty() { 0 } else { 1 };
+        let chunk_len = usize::from(!self.items.is_empty());
         let (lower, upper) = self.stream.size_hint();
         let lower = (lower / self.cap).saturating_add(chunk_len);
         let upper = match upper {
diff --git a/futures-util/src/stream/stream/ready_chunks.rs b/futures-util/src/stream/stream/ready_chunks.rs
@@ -85,7 +85,7 @@ impl<St: Stream> Stream for ReadyChunks<St> {
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let chunk_len = if self.items.is_empty() { 0 } else { 1 };
+        let chunk_len = usize::from(!self.items.is_empty());
         let (lower, upper) = self.stream.size_hint();
         let lower = (lower / self.cap).saturating_add(chunk_len);
         let upper = match upper {
diff --git a/futures-util/src/stream/try_stream/try_chunks.rs b/futures-util/src/stream/try_stream/try_chunks.rs
@@ -82,7 +82,7 @@ impl<St: TryStream> Stream for TryChunks<St> {
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        let chunk_len = if self.items.is_empty() { 0 } else { 1 };
+        let chunk_len = usize::from(!self.items.is_empty());
         let (lower, upper) = self.stream.size_hint();
         let lower = (lower / self.cap).saturating_add(chunk_len);
         let upper = match upper {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ impl<St: Stream> Stream for Chunks<St> {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`fn size_hint(&self) -> (usize, Option<usize>) {`
`80`		`- let chunk_len = if self.items.is_empty() { 0 } else { 1 };`
	`80`	`+ let chunk_len = usize::from(!self.items.is_empty());`
`81`	`81`	`let (lower, upper) = self.stream.size_hint();`
`82`	`82`	`let lower = (lower / self.cap).saturating_add(chunk_len);`
`83`	`83`	`let upper = match upper {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ impl<St: Stream> Stream for ReadyChunks<St> {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`fn size_hint(&self) -> (usize, Option<usize>) {`
`88`		`- let chunk_len = if self.items.is_empty() { 0 } else { 1 };`
	`88`	`+ let chunk_len = usize::from(!self.items.is_empty());`
`89`	`89`	`let (lower, upper) = self.stream.size_hint();`
`90`	`90`	`let lower = (lower / self.cap).saturating_add(chunk_len);`
`91`	`91`	`let upper = match upper {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ impl<St: TryStream> Stream for TryChunks<St> {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`fn size_hint(&self) -> (usize, Option<usize>) {`
`85`		`- let chunk_len = if self.items.is_empty() { 0 } else { 1 };`
	`85`	`+ let chunk_len = usize::from(!self.items.is_empty());`
`86`	`86`	`let (lower, upper) = self.stream.size_hint();`
`87`	`87`	`let lower = (lower / self.cap).saturating_add(chunk_len);`
`88`	`88`	`let upper = match upper {`