diff --git a/src/lib.rs b/src/lib.rs index d159d6f..0997d90 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,10 +23,7 @@ impl TableOfContent { let all_headers = ogg::all_headers(rdr)?; let entries: Vec<_> = all_headers .into_iter() - .map(|(file_pos, hdr)| Entry { - file_pos, - granule_position: hdr.granule_position, - }) + .map(|(file_pos, hdr)| Entry { file_pos, granule_position: hdr.granule_position }) .collect(); Ok(Self { entries }) } @@ -40,10 +37,7 @@ impl TableOfContent { let mut entries = Vec::new(); while let Ok(file_pos) = rdr.read_u64::() { let granule_position = rdr.read_u64::().unwrap(); - entries.push(Entry { - file_pos, - granule_position, - }); + entries.push(Entry { file_pos, granule_position }); } Ok(Self { entries }) } @@ -58,9 +52,7 @@ impl TableOfContent { } pub fn last_entry_before(&self, start_pos: u64) -> Option<&Entry> { - let packet_idx = self - .entries - .partition_point(|entry| entry.granule_position < start_pos); + let packet_idx = self.entries.partition_point(|entry| entry.granule_position < start_pos); let mut packet_idx = packet_idx.saturating_sub(1); while packet_idx < self.entries.len() && self.entries[packet_idx].granule_position == 0 { packet_idx += 1; diff --git a/src/ogg.rs b/src/ogg.rs index d4e4419..400c084 100644 --- a/src/ogg.rs +++ b/src/ogg.rs @@ -113,11 +113,7 @@ impl PacketReader { None => anyhow::bail!("no data left"), Some(header) => header, }; - if self - .current_header - .header_type - .has_flag(HeaderTypeFlag::Continuation) - { + if self.current_header.header_type.has_flag(HeaderTypeFlag::Continuation) { anyhow::bail!("continuations are not handled properly when seeking") } if move_to_last_segment { @@ -135,8 +131,7 @@ impl PacketReader { } } self.segment_idx = n_to_skip; - self.reader - .seek(std::io::SeekFrom::Current(to_skip as i64))?; + self.reader.seek(std::io::SeekFrom::Current(to_skip as i64))?; } Ok(self.current_header.granule_position) } @@ -171,11 +166,7 @@ impl PacketReader { None => anyhow::bail!("empty file"), Some(header) => header, }; - Ok(Self { - reader, - current_header, - segment_idx: 0, - }) + Ok(Self { reader, current_header, segment_idx: 0 }) } pub fn next_packet(&mut self) -> Result>> {