Skip to content

Commit df14a26

Browse files
authored
Fix clippy lints. (#971)
* Fix clippy lints. Co-authored-by: Chloe Brett <[email protected]>
1 parent 1f622a3 commit df14a26

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/host/alsa/enumerate.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl Devices {
2121
unsafe impl Send for Devices {}
2222
unsafe impl Sync for Devices {}
2323

24-
const BUILTINS: [&'static str; 5] = ["default", "pipewire", "pulse", "jack", "oss"];
24+
const BUILTINS: [&str; 5] = ["default", "pipewire", "pulse", "jack", "oss"];
2525

2626
impl Iterator for Devices {
2727
type Item = Device;
@@ -32,7 +32,7 @@ impl Iterator for Devices {
3232
self.builtin_pos += 1;
3333
let name = BUILTINS[pos];
3434

35-
if let Ok(handles) = DeviceHandles::open(&name) {
35+
if let Ok(handles) = DeviceHandles::open(name) {
3636
return Some(Device {
3737
name: name.to_string(),
3838
pcm_id: name.to_string(),
@@ -42,9 +42,7 @@ impl Iterator for Devices {
4242
}
4343

4444
loop {
45-
let Some(res) = self.card_iter.next() else {
46-
return None;
47-
};
45+
let res = self.card_iter.next()?;
4846
let Ok(card) = res else { continue };
4947

5048
let ctl_id = format!("hw:{}", card.get_index());

src/host/alsa/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,9 @@ impl Device {
429429
for &(min_rate, max_rate) in sample_rates.iter() {
430430
output.push(SupportedStreamConfigRange {
431431
channels,
432-
min_sample_rate: SampleRate(min_rate as u32),
433-
max_sample_rate: SampleRate(max_rate as u32),
434-
buffer_size: buffer_size_range.clone(),
432+
min_sample_rate: SampleRate(min_rate),
433+
max_sample_rate: SampleRate(max_rate),
434+
buffer_size: buffer_size_range,
435435
sample_format,
436436
});
437437
}
@@ -478,7 +478,7 @@ impl Device {
478478

479479
formats.sort_by(|a, b| a.cmp_default_heuristics(b));
480480

481-
match formats.into_iter().last() {
481+
match formats.into_iter().next_back() {
482482
Some(f) => {
483483
let min_r = f.min_sample_rate;
484484
let max_r = f.max_sample_rate;

0 commit comments

Comments
 (0)