Skip to content

Commit f894781

Browse files
authored
Fix clippy warnings (#851)
1 parent f3de611 commit f894781

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

examples/beep.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use anyhow;
21
use clap::Parser;
32
use cpal::{
43
traits::{DeviceTrait, HostTrait, StreamTrait},

src/host/coreaudio/macos/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ use std::fmt;
3333
use std::mem;
3434
use std::os::raw::c_char;
3535
use std::ptr::null;
36+
use std::rc::Rc;
3637
use std::slice;
3738
use std::sync::mpsc::{channel, RecvTimeoutError};
3839
use std::sync::{Arc, Mutex};
@@ -306,7 +307,7 @@ impl Device {
306307
channels: n_channels as ChannelCount,
307308
min_sample_rate: SampleRate(range.mMinimum as _),
308309
max_sample_rate: SampleRate(range.mMaximum as _),
309-
buffer_size: buffer_size.clone(),
310+
buffer_size,
310311
sample_format,
311312
};
312313
fmts.push(fmt);
@@ -568,7 +569,7 @@ impl Device {
568569
let sample_rate = config.sample_rate;
569570
type Args = render_callback::Args<data::Raw>;
570571
audio_unit.set_input_callback(move |args: Args| unsafe {
571-
let ptr = (*args.data.data).mBuffers.as_ptr() as *const AudioBuffer;
572+
let ptr = (*args.data.data).mBuffers.as_ptr();
572573
let len = (*args.data.data).mNumberBuffers as usize;
573574
let buffers: &[AudioBuffer] = slice::from_raw_parts(ptr, len);
574575

@@ -580,7 +581,7 @@ impl Device {
580581
} = buffers[0];
581582

582583
let data = data as *mut ();
583-
let len = (data_byte_size as usize / bytes_per_channel) as usize;
584+
let len = data_byte_size as usize / bytes_per_channel;
584585
let data = Data::from_parts(data, len, sample_format);
585586

586587
// TODO: Need a better way to get delay, for now we assume a double-buffer offset.
@@ -685,7 +686,7 @@ impl Device {
685686
} = (*args.data.data).mBuffers[0];
686687

687688
let data = data as *mut ();
688-
let len = (data_byte_size as usize / bytes_per_channel) as usize;
689+
let len = data_byte_size as usize / bytes_per_channel;
689690
let mut data = Data::from_parts(data, len, sample_format);
690691

691692
let callback = match host_time_to_stream_instant(args.time_stamp.mHostTime) {

src/host/coreaudio/macos/property_listener.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::BuildStreamError;
88

99
/// A double-indirection to be able to pass a closure (a fat pointer)
1010
/// via a single c_void.
11-
struct PropertyListenerCallbackWrapper(Box<dyn FnMut() -> ()>);
11+
struct PropertyListenerCallbackWrapper(Box<dyn FnMut()>);
1212

1313
/// Maintain an audio object property listener.
1414
/// The listener will be removed when this type is dropped.
@@ -21,7 +21,7 @@ pub struct AudioObjectPropertyListener {
2121

2222
impl AudioObjectPropertyListener {
2323
/// Attach the provided callback as a audio object property listener.
24-
pub fn new<F: FnMut() -> () + 'static>(
24+
pub fn new<F: FnMut() + 'static>(
2525
audio_object_id: AudioObjectID,
2626
property_address: AudioObjectPropertyAddress,
2727
callback: F,

src/host/coreaudio/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ fn asbd_from_config(
5252
let frames_per_packet = 1;
5353
let bytes_per_packet = frames_per_packet * bytes_per_frame;
5454
let format_flags = match sample_format {
55-
SampleFormat::F32 => (kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked) as u32,
56-
_ => kAudioFormatFlagIsPacked as u32,
55+
SampleFormat::F32 => kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked,
56+
_ => kAudioFormatFlagIsPacked,
5757
};
5858
AudioStreamBasicDescription {
5959
mBitsPerChannel: bits_per_channel as _,

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ impl SupportedStreamConfigRange {
742742

743743
#[test]
744744
fn test_cmp_default_heuristics() {
745-
let mut formats = vec![
745+
let mut formats = [
746746
SupportedStreamConfigRange {
747747
buffer_size: SupportedBufferSize::Range { min: 256, max: 512 },
748748
channels: 2,

0 commit comments

Comments
 (0)