diff options
author | Sharif Haason <ssh128@scarletmail.rutgers.edu> | 2022-12-07 16:44:11 -0500 |
---|---|---|
committer | Sharif Haason <ssh128@scarletmail.rutgers.edu> | 2022-12-07 16:44:11 -0500 |
commit | faa9866d1149e48f837076db1d6f9b7dd70df21c (patch) | |
tree | 496a1219f4692dd9ae4edbfe3f2b7e7408d9a7e5 | |
parent | b2f0e75ed25fd979817d58f0aeefd7dc409c7609 (diff) |
Change `group_bytes` to satisfy merge conflict
-rw-r--r-- | src/lib.rs | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -251,7 +251,7 @@ pub struct Printer<'a, Writer: Write> { panels: u64, squeeze_byte: usize, /// The number of octets per group. - group_bytes: u8, + group_size: u8, /// The number of digits used to write the base. base_digits: u8, } @@ -265,7 +265,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> { border_style: BorderStyle, use_squeeze: bool, panels: u64, - group_bytes: u8, + group_size: u8, base: Base, ) -> Printer<'a, Writer> { Printer { @@ -297,7 +297,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> { display_offset: 0, panels, squeeze_byte: 0x00, - group_bytes, + group_size, base_digits: match base { Base::Binary => 8, Base::Octal => 3, @@ -314,8 +314,8 @@ impl<'a, Writer: Write> Printer<'a, Writer> { fn panel_sz(&self) -> usize { // add one to include the trailing space of a group - let group_sz = self.base_digits as usize * self.group_bytes as usize + 1; - let group_per_panel = 8 / self.group_bytes as usize; + let group_sz = self.base_digits as usize * self.group_size as usize + 1; + let group_per_panel = 8 / self.group_size as usize; // add one to include the leading space 1 + group_sz * group_per_panel } @@ -476,7 +476,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> { if self.show_color { self.writer.write_all(COLOR_RESET)?; } - } else if i % (self.group_bytes as usize) == 0 { + } else if i % (self.group_size as usize) == 0 { self.writer.write_all(b" ")?; } for _ in 0..self.base_digits { @@ -485,7 +485,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> { } Squeezer::Delete => self.writer.write_all(b" ")?, Squeezer::Ignore | Squeezer::Disabled => { - if i % (self.group_bytes as usize) == 0 { + if i % (self.group_size as usize) == 0 { self.writer.write_all(b" ")?; } if self.show_color && self.curr_color != Some(Byte(b).color()) { |