diff --git a/vortex-buffer/src/trusted_len.rs b/vortex-buffer/src/trusted_len.rs index fcd2fc59e6b..433c85f428d 100644 --- a/vortex-buffer/src/trusted_len.rs +++ b/vortex-buffer/src/trusted_len.rs @@ -30,29 +30,23 @@ impl Iterator for TrustedLenAdapter { #[inline] fn next(&mut self) -> Option { - match self.inner.next() { - None => { - #[cfg(debug_assertions)] - { - assert_eq!( - self.len, self.count, - "TrustedLenAdapter: iterator ended early" - ); - } - None - } - Some(item) => { - #[cfg(debug_assertions)] - { - self.count += 1; - assert!( - self.count <= self.len, - "TrustedLenAdapter: iterator yielded more items than promised" - ); - } - Some(item) + let item = self.inner.next(); + #[cfg(debug_assertions)] + { + if item.is_some() { + self.count += 1; + assert!( + self.count <= self.len, + "TrustedLenAdapter: iterator yielded more items than promised" + ); + } else { + assert_eq!( + self.len, self.count, + "TrustedLenAdapter: iterator ended early" + ); } } + item } #[inline]