From 437145afbe00177d10ee90c2ba224aa9e1e1ba85 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 15 Dec 2021 06:52:37 -0700 Subject: [PATCH] Remove assertion and don't consume 0 bytes Co-Authored-By: Antonio Scandurra --- crates/editor/src/multi_buffer.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/multi_buffer.rs b/crates/editor/src/multi_buffer.rs index c9412920b5821ad7c64d4b2053918745d8494db5..52785a12027a4f57840e5310c6bfd651f69a1fa0 100644 --- a/crates/editor/src/multi_buffer.rs +++ b/crates/editor/src/multi_buffer.rs @@ -1753,8 +1753,6 @@ impl<'a> Iterator for MultiBufferChunks<'a> { impl<'a> MultiBufferBytes<'a> { fn consume(&mut self, len: usize) { - assert!(len > 0); - self.range.start += len; self.chunk = &self.chunk[len..]; @@ -1796,7 +1794,9 @@ impl<'a> io::Read for MultiBufferBytes<'a> { fn read(&mut self, buf: &mut [u8]) -> io::Result { let len = cmp::min(buf.len(), self.chunk.len()); buf[..len].copy_from_slice(&self.chunk[..len]); - self.consume(len); + if len > 0 { + self.consume(len); + } Ok(len) } }