From a0a058a012c491ded761e0e4574613335c9d8040 Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Thu, 1 Oct 2026 15:09:36 -0700 Subject: [PATCH] fmt, clippy --- src/mux/m2ts.rs | 5 ++++- src/mux/mpg/pstd.rs | 3 ++- src/mux/mpg/scan.rs | 7 ++++++- src/mux/mpg/tests.rs | 19 +++++++++++++++---- src/mux/network.rs | 4 +++- src/mux/pipelined_stream.rs | 5 ++++- src/mux/resolve.rs | 4 +++- src/mux/selected.rs | 12 ++++++++++-- src/mux/tsmux.rs | 3 ++- 9 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/mux/m2ts.rs b/src/mux/m2ts.rs index dc03e9f9..8e6917ba 100644 --- a/src/mux/m2ts.rs +++ b/src/mux/m2ts.rs @@ -1227,7 +1227,10 @@ mod tests { title.codec_privates = vec![None; 3]; let shared = std::sync::Arc::new(std::sync::Mutex::new(Vec::::new())); let mut stream = M2tsStream::create(SharedSink(shared.clone()), &title).unwrap(); - assert!(stream.undelivered_streams().is_empty(), "nothing arrived yet"); + assert!( + stream.undelivered_streams().is_empty(), + "nothing arrived yet" + ); stream .write(&frame(0, 0, true, fake_idr_pes_data())) .unwrap(); diff --git a/src/mux/mpg/pstd.rs b/src/mux/mpg/pstd.rs index bfa43fb4..48714ef8 100644 --- a/src/mux/mpg/pstd.rs +++ b/src/mux/mpg/pstd.rs @@ -1049,7 +1049,8 @@ mod tests { ); let e = m.finish().expect_err("an AU that cannot be packetized"); assert!( - e.to_string().contains(&crate::error::Error::MpgUnpacketized.to_string()), + e.to_string() + .contains(&crate::error::Error::MpgUnpacketized.to_string()), "{e}" ); } diff --git a/src/mux/mpg/scan.rs b/src/mux/mpg/scan.rs index 85429a29..b1c9f829 100644 --- a/src/mux/mpg/scan.rs +++ b/src/mux/mpg/scan.rs @@ -601,7 +601,12 @@ mod probe_tests { ]; for (i, rate) in want.into_iter().enumerate() { let es = video(720, 576, i as u8 + 1, false); - assert_eq!(probe_video(&es, Some(0x02)).unwrap().2, rate, "code {}", i + 1); + assert_eq!( + probe_video(&es, Some(0x02)).unwrap().2, + rate, + "code {}", + i + 1 + ); } let es = video(720, 576, 0, false); assert_eq!(probe_video(&es, Some(0x02)).unwrap().2, FrameRate::Unknown); diff --git a/src/mux/mpg/tests.rs b/src/mux/mpg/tests.rs index 63a71279..6987e927 100644 --- a/src/mux/mpg/tests.rs +++ b/src/mux/mpg/tests.rs @@ -2330,7 +2330,10 @@ fn a_timestamp_below_the_origin_is_clamped_and_counted() { let out = sink.mux.take().unwrap().into_writer(); let parsed = replay::parse(&out).unwrap(); assert!( - parsed.pes.iter().any(|x| x.key.0 == 0xC0 && x.pts == Some(0)), + parsed + .pes + .iter() + .any(|x| x.key.0 == 0xC0 && x.pts == Some(0)), "the clamped AU is stamped 0" ); } @@ -2412,7 +2415,7 @@ fn a_partial_lpcm_unit_at_eof_is_padded_not_lost() { secs: 2, ..Opts::default() }); - let last = fx.frames.iter().filter(|f| f.track == 6).last().unwrap(); + let last = fx.frames.iter().rfind(|f| f.track == 6).unwrap(); // Three stereo 24-bit sample frames: under any packing unit. let tail = PesFrame { pts: last.pts + 10 * MS, @@ -2494,8 +2497,16 @@ fn a_map_pairing_an_extension_with_the_wrong_base_drops_it() { }; let e = [ entry(0x02, 0xE0, vec![]), - entry(0x04, 0xC0, pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 0, 0).to_vec()), - entry(0x04, 0xC1, pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 2, 0).to_vec()), + entry( + 0x04, + 0xC0, + pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 0, 0).to_vec(), + ), + entry( + 0x04, + 0xC1, + pack::hierarchy_descriptor(pack::HIERARCHY_BASE, 2, 0).to_vec(), + ), // 0xD1 embeds layer 0 (base 0xC0), but the IR pairs 0xD1 only with 0xC1. entry( 0x04, diff --git a/src/mux/network.rs b/src/mux/network.rs index c507b77b..67f1efcc 100644 --- a/src/mux/network.rs +++ b/src/mux/network.rs @@ -761,7 +761,9 @@ mod tests { .meta(&sample_title()); writer.write(&one_frame()).unwrap(); let linger = |w: &NetworkStream| match &w.mode { - Mode::Write { writer, .. } => socket2::SockRef::from(writer.get_ref()).linger().unwrap(), + Mode::Write { writer, .. } => { + socket2::SockRef::from(writer.get_ref()).linger().unwrap() + } Mode::Read { .. } => unreachable!(), }; assert_eq!(linger(&writer), None); diff --git a/src/mux/pipelined_stream.rs b/src/mux/pipelined_stream.rs index 83340a3a..39d3beeb 100644 --- a/src/mux/pipelined_stream.rs +++ b/src/mux/pipelined_stream.rs @@ -905,7 +905,10 @@ mod tests { tx.send(DemuxBatch::Ts(vec![ts_pes(0x1011, vec![1])])) .unwrap(); tx.send(DemuxBatch::Eof).unwrap(); - assert!(stream.read().unwrap().is_none(), "the dangling frame is dropped"); + assert!( + stream.read().unwrap().is_none(), + "the dangling frame is dropped" + ); assert_eq!(stream.errors(), 1, "and counted"); } diff --git a/src/mux/resolve.rs b/src/mux/resolve.rs index 13cc2830..3d68a8de 100644 --- a/src/mux/resolve.rs +++ b/src/mux/resolve.rs @@ -992,7 +992,9 @@ pub(crate) fn build_keyed_pipeline( ) .map_err(io::Error::from)?; let plan = IsoPlan { - extents: set.key_map().read_plan(&full_extents, u32::from(AACS_UNIT_SECTORS)), + extents: set + .key_map() + .read_plan(&full_extents, u32::from(AACS_UNIT_SECTORS)), full_extents, policy, unit_align: AACS_UNIT_SECTORS, diff --git a/src/mux/selected.rs b/src/mux/selected.rs index 441b0c32..59ef8a73 100644 --- a/src/mux/selected.rs +++ b/src/mux/selected.rs @@ -197,9 +197,17 @@ mod tests { subtitle: PidFilter::All, }; let s = SelectedSource::wrap(Box::new(src), &sel).unwrap(); - assert_eq!(s.track_timing(0).codec_delay_ns, 20, "inner track 2's timing"); + assert_eq!( + s.track_timing(0).codec_delay_ns, + 20, + "inner track 2's timing" + ); assert_eq!(s.track_timing(1), TrackTiming::default()); - assert_eq!(s.config_changes(), vec![(0, 7)], "renumbered, unkept dropped"); + assert_eq!( + s.config_changes(), + vec![(0, 7)], + "renumbered, unkept dropped" + ); assert_eq!((s.errors(), s.lost_bytes()), (5, 9)); assert!(!s.headers_ready()); } diff --git a/src/mux/tsmux.rs b/src/mux/tsmux.rs index cfc719d0..5c206d57 100644 --- a/src/mux/tsmux.rs +++ b/src/mux/tsmux.rs @@ -1449,7 +1449,8 @@ mod tests { let mut mux = TsMuxer::new(&mut sink, &pids); mux.set_program(types.to_vec()).unwrap(); for t in 0..types.len() { - mux.write_frame(t, 0, true, &[0xFF, 0xF1, 0x4C, 0x80]).unwrap(); + mux.write_frame(t, 0, true, &[0xFF, 0xF1, 0x4C, 0x80]) + .unwrap(); } mux.finish().unwrap(); }