diff options
author | Mikail Bagishov <bagishov.mikail@yandex.ru> | 2020-04-23 21:19:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-23 20:19:56 +0200 |
commit | 236629d1be7208612cbe5388e7ffebf85b73c157 (patch) | |
tree | 73ca0d102a5220d7693c4cacbdc0523fe7d1b1aa /tokio/src/stream/chain.rs | |
parent | f83f6388c42aa62c2096073b1dd80459189d7ea9 (diff) |
stream: fix panic in Merge and Chain size_hint (#2430)
Diffstat (limited to 'tokio/src/stream/chain.rs')
-rw-r--r-- | tokio/src/stream/chain.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tokio/src/stream/chain.rs b/tokio/src/stream/chain.rs index 5f0324a4..6124c91e 100644 --- a/tokio/src/stream/chain.rs +++ b/tokio/src/stream/chain.rs @@ -44,14 +44,6 @@ where } fn size_hint(&self) -> (usize, Option<usize>) { - let (a_lower, a_upper) = self.a.size_hint(); - let (b_lower, b_upper) = self.b.size_hint(); - - let upper = match (a_upper, b_upper) { - (Some(a_upper), Some(b_upper)) => Some(a_upper + b_upper), - _ => None, - }; - - (a_lower + b_lower, upper) + super::merge_size_hints(self.a.size_hint(), self.b.size_hint()) } } |