From 3874dc42f8e29ed3834e3f759823233f08df2a05 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Sat, 2 Jan 2021 21:30:52 +0100 Subject: [PATCH] cargo clippy --- src/mpris.rs | 2 +- src/queue.rs | 7 +++---- src/spotify.rs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mpris.rs b/src/mpris.rs index 06432ac..fac78be 100644 --- a/src/mpris.rs +++ b/src/mpris.rs @@ -283,7 +283,7 @@ fn run_dbus_server( .on_set(move |i, _| { let cur = spotify2.volume() as f64 / 65535_f64; let req = i.get::().unwrap_or(cur); - if req >= 0.0 && req <= 1.0 { + if (0.0..=1.0).contains(&req) { let vol = (VOLUME_PERCENT as f64) * req * 100.0; spotify2.set_volume(vol as u16); } diff --git a/src/queue.rs b/src/queue.rs index 21f0ba9..3d375ff 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -105,10 +105,9 @@ impl Queue { if let Some(order) = random_order.as_mut() { let next_i = order.iter().position(|&i| i == index).unwrap(); // shift everything after the insertion in order - let size = order.len(); - for i in 0..size { - if order[i] > index { - order[i] += 1; + for item in order.iter_mut() { + if *item > index { + *item += 1; } } // finally, add the next track index diff --git a/src/spotify.rs b/src/spotify.rs index 94bbdbb..e428c65 100644 --- a/src/spotify.rs +++ b/src/spotify.rs @@ -260,9 +260,9 @@ impl Spotify { let volume = match &cfg.values().saved_state { Some(state) => match state.volume { Some(vol) => ((std::cmp::min(vol, 100) as f32) / 100.0 * 65535_f32).ceil() as u16, - None => 0xFFFF as u16, + None => 0xFFFF_u16, }, - None => 0xFFFF as u16, + None => 0xFFFF_u16, }; let repeat = match &cfg.values().saved_state { Some(state) => match &state.repeat {