Zero clippy warnings: fix all 32 remaining

- Iterator::find() replaces manual loops (6 sites)
- Index-only loops → iterators (4 sites)
- Identical if-blocks merged
- Box large MkvStream WriteState enum variant
- Vec macro initializers, late init fixes
- Unused fields prefixed with underscore (format spec fields)
- Dead code removed or documented

0 clippy warnings. 319 tests passing.
This commit is contained in:
MattJackson
2026-04-11 19:33:13 +00:00
parent 75f15cae62
commit f48b4925c1
27 changed files with 80 additions and 106 deletions
+2 -2
View File
@@ -32,8 +32,8 @@ fn css_descramble_sector_roundtrip_via_public_api() {
sector[0x82] = 0x01;
sector[0x83] = 0xE0;
// Fill content
for i in 0x84..2048 {
sector[i] = (i & 0xFF) as u8;
for (i, byte) in sector.iter_mut().enumerate().take(2048).skip(0x84) {
*byte = (i & 0xFF) as u8;
}
let original = sector.clone();
+2 -2
View File
@@ -265,7 +265,7 @@ fn make_dir_icb(data_meta_lba: u32, data_len: u32) -> Vec<u8> {
}
fn make_parent_fid() -> Vec<u8> {
let fid_len = ((38 + 0 + 0 + 3) & !3) as usize;
let fid_len = (38 + 3) & !3;
let mut fid = vec![0u8; fid_len];
fid[0..2].copy_from_slice(&257u16.to_le_bytes());
fid[18] = 0x08;
@@ -278,7 +278,7 @@ fn make_fid(name: &str, icb_meta_lba: u32, is_dir: bool) -> Vec<u8> {
name_bytes.extend_from_slice(name.as_bytes());
let l_fi = name_bytes.len() as u8;
let file_chars: u8 = if is_dir { 0x02 } else { 0x00 };
let fid_len = ((38 + 0 + l_fi as usize + 3) & !3) as usize;
let fid_len = (38 + l_fi as usize + 3) & !3;
let mut fid = vec![0u8; fid_len];
fid[0..2].copy_from_slice(&257u16.to_le_bytes());
fid[18] = file_chars;
+3 -3
View File
@@ -2,7 +2,7 @@
use libfreemkv::mux::meta::M2tsMeta;
use libfreemkv::*;
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
use std::io::{Cursor, Read, Write};
fn sample_disc_title() -> DiscTitle {
DiscTitle {
@@ -325,8 +325,8 @@ fn m2ts_passthrough_preserves_data() {
pkt[4] = 0x47;
pkt[5] = (i % 3) << 4;
pkt[6] = i;
for j in 8..192 {
pkt[j] = i.wrapping_add(j as u8);
for (j, byte) in pkt.iter_mut().enumerate().skip(8) {
*byte = i.wrapping_add(j as u8);
}
original.extend_from_slice(&pkt);
}
+4 -4
View File
@@ -154,7 +154,7 @@ fn make_fid(name: &str, icb_meta_lba: u32, is_dir: bool) -> Vec<u8> {
let file_chars: u8 = if is_dir { 0x02 } else { 0x00 };
// Fixed header = 38 bytes, L_IU = 0
let fid_len = ((38 + 0 + l_fi as usize + 3) & !3) as usize; // 4-byte aligned
let fid_len = (38 + l_fi as usize + 3) & !3; // 4-byte aligned
let mut fid = vec![0u8; fid_len];
// tag_id = 257
fid[0..2].copy_from_slice(&257u16.to_le_bytes());
@@ -176,7 +176,7 @@ fn make_fid(name: &str, icb_meta_lba: u32, is_dir: bool) -> Vec<u8> {
/// Build a parent FID (file_chars = 0x08, no name).
fn make_parent_fid() -> Vec<u8> {
let fid_len = ((38 + 0 + 0 + 3) & !3) as usize;
let fid_len = (38 + 3) & !3;
let mut fid = vec![0u8; fid_len];
fid[0..2].copy_from_slice(&257u16.to_le_bytes());
fid[18] = 0x08; // parent
@@ -362,7 +362,7 @@ fn read_filesystem_with_subdirectory() {
reader.set_sector(35, make_terminator());
// FSD -> root ICB at meta LBA 1
reader.set_sector(partition_start + 0, make_fsd_sector(1));
reader.set_sector(partition_start, make_fsd_sector(1));
// Root dir: parent FID + BDMV dir FID
let parent_fid = make_parent_fid();
@@ -419,7 +419,7 @@ fn find_dir_case_insensitive() {
reader.set_sector(35, make_terminator());
// FSD
reader.set_sector(partition_start + 0, make_fsd_sector(1));
reader.set_sector(partition_start, make_fsd_sector(1));
// Root -> BDMV
let root_data = [make_parent_fid(), make_fid("BDMV", 3, true)].concat();