Skip to content

Commit

Permalink
Chore: Fix new(er) Clippy lints
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixMcFelix committed Nov 20, 2023
1 parent 646190e commit 662debd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/driver/tasks/disposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl DisposalThread {
}

pub(super) fn dispose(&self, message: DisposalMessage) {
drop(self.0.send(message))
drop(self.0.send(message));
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/driver/tasks/mixer/mix_logic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ where
if source_mono {
// mix this signal into *all* output channels at req'd volume.
let source_plane = source_raw_planes[0];
for d_plane in (&mut *target.planes_mut().planes()).iter_mut() {
for d_plane in (*target.planes_mut().planes()).iter_mut() {
for (d, s) in d_plane[dest_pos..dest_pos + mix_ct]
.iter_mut()
.zip(source_plane[source_pos..source_pos + mix_ct].iter())
Expand All @@ -331,7 +331,7 @@ where
}
} else {
// stereo -> stereo: don't change volume, map input -> output channels w/ no duplication
for (d_plane, s_plane) in (&mut *target.planes_mut().planes())
for (d_plane, s_plane) in (*target.planes_mut().planes())
.iter_mut()
.zip(source_raw_planes[..].iter())
{
Expand Down Expand Up @@ -364,7 +364,7 @@ fn mix_resampled(
// see `mix_symph_buffer` for explanations of stereo<->mono logic.
if source_mono {
let source_plane = &source[0];
for d_plane in (&mut *target.planes_mut().planes()).iter_mut() {
for d_plane in (*target.planes_mut().planes()).iter_mut() {
for (d, s) in d_plane[dest_pos..dest_pos + mix_ct]
.iter_mut()
.zip(source_plane)
Expand All @@ -382,7 +382,7 @@ fn mix_resampled(
}
}
} else {
for (d_plane, s_plane) in (&mut *target.planes_mut().planes())
for (d_plane, s_plane) in (*target.planes_mut().planes())
.iter_mut()
.zip(source[..].iter())
{
Expand Down Expand Up @@ -428,7 +428,7 @@ fn copy_symph_buffer<S>(
where
S: Sample + IntoSample<f32>,
{
for (d_plane, s_plane) in (&mut *target.planes_mut().planes())
for (d_plane, s_plane) in (*target.planes_mut().planes())
.iter_mut()
.zip(source.planes().planes()[..].iter())
{
Expand Down
5 changes: 2 additions & 3 deletions src/driver/tasks/mixer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,7 @@ impl Mixer {

let payload = rtp.payload_mut();

(&mut payload[TAG_SIZE..TAG_SIZE + SILENT_FRAME.len()])
.copy_from_slice(&SILENT_FRAME[..]);
payload[TAG_SIZE..TAG_SIZE + SILENT_FRAME.len()].copy_from_slice(&SILENT_FRAME[..]);

mix_len = MixType::Passthrough(SILENT_FRAME.len());
} else {
Expand Down Expand Up @@ -680,7 +679,7 @@ impl Mixer {
// for handing out audio data to the outside world.
let samples_to_copy = self.config.mix_mode.channels() * n;

(&mut softclip_buffer[..samples_to_copy])
softclip_buffer[..samples_to_copy]
.copy_from_slice(&self.sample_buffer.samples()[..samples_to_copy]);
}

Expand Down
2 changes: 1 addition & 1 deletion src/input/adapters/cached/hint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ where
config.length_hint = Some(match hint.into() {
LengthHint::Bytes(a) => a,
LengthHint::Time(t) => {
let s = t.as_secs() + if t.subsec_millis() > 0 { 1 } else { 0 };
let s = t.as_secs() + u64::from(t.subsec_millis() > 0);
(s as usize) * cost_per_sec
},
});
Expand Down
4 changes: 2 additions & 2 deletions src/input/adapters/cached/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ where
let to_write = remaining.min(interleaved_space);
let need_spill = non_contiguous_end && to_write < remaining;

let samples_used = to_write + if need_spill { 1 } else { 0 };
let samples_used = to_write + usize::from(need_spill);
let last_sample = source_pos.start + to_write;

if need_spill {
Expand Down Expand Up @@ -430,7 +430,7 @@ fn write_resample_buffer(
let to_write = remaining.min(interleaved_space);
let need_spill = non_contiguous_end && to_write < remaining;

let samples_used = to_write + if need_spill { 1 } else { 0 };
let samples_used = to_write + usize::from(need_spill);
let last_sample = source_pos.start + to_write;

if need_spill {
Expand Down
2 changes: 1 addition & 1 deletion src/input/sources/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl<P: AsRef<Path> + Send + Sync> Compose for File<P> {
];

let mut output = Command::new("ffprobe")
.args(&args)
.args(args)
.output()
.await
.map_err(|e| AudioStreamError::Fail(Box::new(e)))?;
Expand Down
2 changes: 1 addition & 1 deletion src/input/sources/ytdl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl YoutubeDl {
let ytdl_args = ["-j", &self.url, "-f", "ba[abr>0][vcodec=none]/best"];

let mut output = Command::new(self.program)
.args(&ytdl_args)
.args(ytdl_args)
.output()
.await
.map_err(|e| AudioStreamError::Fail(Box::new(e)))?;
Expand Down

0 comments on commit 662debd

Please sign in to comment.