Refactor to avoid code duplication

This commit is contained in:
Sharif Haason committed 2023-06-20 10:55:07 -04:00
1 parent ef9b530d6a
commit dfad7b3faf
1 file changed
+4 -8
+4 -8
View File
@@ -585,7 +585,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
} }
let mut leftover = n; let mut leftover = n;
// loop until input is ceased // loop until input is ceased
break loop { if let Some(s) = loop {
if let Ok(n) = buf.read(&mut self.line_buf[leftover..]) { if let Ok(n) = buf.read(&mut self.line_buf[leftover..]) {
leftover += n; leftover += n;
// there is no more input being read // there is no more input being read
@@ -595,15 +595,11 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
} }
// amount read has exceeded line buffer // amount read has exceeded line buffer
if leftover >= 8 * self.panels as usize { if leftover >= 8 * self.panels as usize {
self.print_position_panel()?; break None;
self.print_bytes()?;
if self.show_char_panel {
self.print_char_panel()?;
}
self.writer.write_all(b"\n")?;
leftover = 0;
} }
} }
} {
break Some(s);
}; };
} else if n == 0 { } else if n == 0 {
// if no bytes are read, that indicates end of file // if no bytes are read, that indicates end of file