Skip to content

Commit fbc0f71

Browse files
authored
Merge pull request #548 from xMAC94x/clippy
clippy fixes
2 parents 5cfa090 + a945d83 commit fbc0f71

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

src/host/alsa/mod.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ impl Device {
387387
}
388388
}
389389

390-
if rates.len() == 0 {
390+
if rates.is_empty() {
391391
vec![(min_rate, max_rate)]
392392
} else {
393393
rates
@@ -423,11 +423,11 @@ impl Device {
423423
for channels in supported_channels.iter() {
424424
for &(min_rate, max_rate) in sample_rates.iter() {
425425
output.push(SupportedStreamConfigRange {
426-
channels: channels.clone(),
426+
channels: *channels,
427427
min_sample_rate: SampleRate(min_rate as u32),
428428
max_sample_rate: SampleRate(max_rate as u32),
429429
buffer_size: buffer_size_range.clone(),
430-
sample_format: sample_format,
430+
sample_format,
431431
});
432432
}
433433
}
@@ -912,9 +912,12 @@ impl Stream {
912912
let (tx, rx) = trigger();
913913
// Clone the handle for passing into worker thread.
914914
let stream = inner.clone();
915-
let thread = thread::spawn(move || {
916-
input_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback);
917-
});
915+
let thread = thread::Builder::new()
916+
.name("cpal_alsa_in".to_owned())
917+
.spawn(move || {
918+
input_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback);
919+
})
920+
.unwrap();
918921
Stream {
919922
thread: Some(thread),
920923
inner,
@@ -934,9 +937,12 @@ impl Stream {
934937
let (tx, rx) = trigger();
935938
// Clone the handle for passing into worker thread.
936939
let stream = inner.clone();
937-
let thread = thread::spawn(move || {
938-
output_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback);
939-
});
940+
let thread = thread::Builder::new()
941+
.name("cpal_alsa_out".to_owned())
942+
.spawn(move || {
943+
output_stream_worker(rx, &*stream, &mut data_callback, &mut error_callback);
944+
})
945+
.unwrap();
940946
Stream {
941947
thread: Some(thread),
942948
inner,

src/host/wasapi/stream.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ impl Stream {
100100
commands: rx,
101101
};
102102

103-
let thread =
104-
thread::spawn(move || run_input(run_context, &mut data_callback, &mut error_callback));
103+
let thread = thread::Builder::new()
104+
.name("cpal_wasapi_in".to_owned())
105+
.spawn(move || run_input(run_context, &mut data_callback, &mut error_callback))
106+
.unwrap();
105107

106108
Stream {
107109
thread: Some(thread),
@@ -129,8 +131,10 @@ impl Stream {
129131
commands: rx,
130132
};
131133

132-
let thread =
133-
thread::spawn(move || run_output(run_context, &mut data_callback, &mut error_callback));
134+
let thread = thread::Builder::new()
135+
.name("cpal_wasapi_out".to_owned())
136+
.spawn(move || run_output(run_context, &mut data_callback, &mut error_callback))
137+
.unwrap();
134138

135139
Stream {
136140
thread: Some(thread),

0 commit comments

Comments
 (0)