Skip to content

Commit 9285e02

Browse files
committed
clippy
1 parent 599c380 commit 9285e02

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

crates/recording/src/output_pipeline/macos_fragmented_m4s.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ impl Muxer for MacOSFragmentedM4SMuxer {
203203
}
204204
}
205205

206-
if let Ok(mut encoder) = state.encoder.lock() {
207-
if let Err(e) = encoder.finish_with_timestamp(timestamp) {
208-
warn!("Failed to finish segmented encoder: {e}");
209-
}
206+
if let Ok(mut encoder) = state.encoder.lock()
207+
&& let Err(e) = encoder.finish_with_timestamp(timestamp)
208+
{
209+
warn!("Failed to finish segmented encoder: {e}");
210210
}
211211
}
212212

@@ -269,7 +269,7 @@ impl MacOSFragmentedM4SMuxer {
269269

270270
if convert_elapsed_ms > SLOW_THRESHOLD_MS {
271271
slow_convert_count += 1;
272-
if slow_convert_count <= 5 || slow_convert_count % 100 == 0 {
272+
if slow_convert_count <= 5 || slow_convert_count.is_multiple_of(100) {
273273
debug!(
274274
elapsed_ms = convert_elapsed_ms,
275275
count = slow_convert_count,
@@ -284,17 +284,17 @@ impl MacOSFragmentedM4SMuxer {
284284
let encode_start = std::time::Instant::now();
285285
let owned_frame = frame_pool.take_frame();
286286

287-
if let Ok(mut encoder) = encoder_clone.lock() {
288-
if let Err(e) = encoder.queue_frame(owned_frame, timestamp) {
289-
warn!("Failed to encode frame: {e}");
290-
}
287+
if let Ok(mut encoder) = encoder_clone.lock()
288+
&& let Err(e) = encoder.queue_frame(owned_frame, timestamp)
289+
{
290+
warn!("Failed to encode frame: {e}");
291291
}
292292

293293
let encode_elapsed_ms = encode_start.elapsed().as_millis();
294294

295295
if encode_elapsed_ms > SLOW_THRESHOLD_MS {
296296
slow_encode_count += 1;
297-
if slow_encode_count <= 5 || slow_encode_count % 100 == 0 {
297+
if slow_encode_count <= 5 || slow_encode_count.is_multiple_of(100) {
298298
debug!(
299299
elapsed_ms = encode_elapsed_ms,
300300
count = slow_encode_count,
@@ -676,10 +676,10 @@ impl Muxer for MacOSFragmentedM4SCameraMuxer {
676676
}
677677
}
678678

679-
if let Ok(mut encoder) = state.encoder.lock() {
680-
if let Err(e) = encoder.finish_with_timestamp(timestamp) {
681-
warn!("Failed to finish camera segmented encoder: {e}");
682-
}
679+
if let Ok(mut encoder) = state.encoder.lock()
680+
&& let Err(e) = encoder.finish_with_timestamp(timestamp)
681+
{
682+
warn!("Failed to finish camera segmented encoder: {e}");
683683
}
684684
}
685685

@@ -744,7 +744,7 @@ impl MacOSFragmentedM4SCameraMuxer {
744744

745745
if convert_elapsed_ms > SLOW_THRESHOLD_MS {
746746
slow_convert_count += 1;
747-
if slow_convert_count <= 5 || slow_convert_count % 100 == 0 {
747+
if slow_convert_count <= 5 || slow_convert_count.is_multiple_of(100) {
748748
debug!(
749749
elapsed_ms = convert_elapsed_ms,
750750
count = slow_convert_count,
@@ -759,17 +759,17 @@ impl MacOSFragmentedM4SCameraMuxer {
759759
let encode_start = std::time::Instant::now();
760760
let owned_frame = frame_pool.take_frame();
761761

762-
if let Ok(mut encoder) = encoder_clone.lock() {
763-
if let Err(e) = encoder.queue_frame(owned_frame, timestamp) {
764-
warn!("Failed to encode camera frame: {e}");
765-
}
762+
if let Ok(mut encoder) = encoder_clone.lock()
763+
&& let Err(e) = encoder.queue_frame(owned_frame, timestamp)
764+
{
765+
warn!("Failed to encode camera frame: {e}");
766766
}
767767

768768
let encode_elapsed_ms = encode_start.elapsed().as_millis();
769769

770770
if encode_elapsed_ms > SLOW_THRESHOLD_MS {
771771
slow_encode_count += 1;
772-
if slow_encode_count <= 5 || slow_encode_count % 100 == 0 {
772+
if slow_encode_count <= 5 || slow_encode_count.is_multiple_of(100) {
773773
debug!(
774774
elapsed_ms = encode_elapsed_ms,
775775
count = slow_encode_count,

crates/recording/src/recovery.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,10 +518,10 @@ impl RecoveryManager {
518518
debug!("Failed to remove display fragment {:?}: {e}", fragment);
519519
}
520520
}
521-
if let Some(init_path) = &segment.display_init_segment {
522-
if let Err(e) = std::fs::remove_file(init_path) {
523-
debug!("Failed to remove display init segment {:?}: {e}", init_path);
524-
}
521+
if let Some(init_path) = &segment.display_init_segment
522+
&& let Err(e) = std::fs::remove_file(init_path)
523+
{
524+
debug!("Failed to remove display init segment {:?}: {e}", init_path);
525525
}
526526
let display_dir = segment_dir.join("display");
527527
if display_dir.exists()
@@ -569,10 +569,10 @@ impl RecoveryManager {
569569
debug!("Failed to remove camera fragment {:?}: {e}", fragment);
570570
}
571571
}
572-
if let Some(init_path) = &segment.camera_init_segment {
573-
if let Err(e) = std::fs::remove_file(init_path) {
574-
debug!("Failed to remove camera init segment {:?}: {e}", init_path);
575-
}
572+
if let Some(init_path) = &segment.camera_init_segment
573+
&& let Err(e) = std::fs::remove_file(init_path)
574+
{
575+
debug!("Failed to remove camera init segment {:?}: {e}", init_path);
576576
}
577577
let camera_dir = segment_dir.join("camera");
578578
if camera_dir.exists()

0 commit comments

Comments
 (0)