Fix clippy nags

This commit is contained in:
2023-11-05 13:28:20 +01:00
parent e458c69c80
commit fee9c7a171
4 changed files with 27 additions and 24 deletions

View File

@ -144,7 +144,7 @@ fn wind_speed_to_beaufort(mps: f64) -> BeaufortScale {
let index = beaufort_wind_speeds let index = beaufort_wind_speeds
.iter() .iter()
.enumerate() .enumerate()
.find_map(|(i, range)| range.contains(&mps).then(|| i)) .find_map(|(i, range)| range.contains(&mps).then_some(i))
.unwrap_or(beaufort_wind_speeds.len()); .unwrap_or(beaufort_wind_speeds.len());
BeaufortScale(index as u8) BeaufortScale(index as u8)

View File

@ -122,10 +122,9 @@ pub async fn lights_task(state: &State) {
if let Some(old_handle) = wake_tasks.insert((id, day), handle) { if let Some(old_handle) = wake_tasks.insert((id, day), handle) {
old_handle.abort(); old_handle.abort();
}} else {
if let Some(old_handle) = wake_tasks.remove(&(id, day)) {
old_handle.abort();
} }
} else if let Some(old_handle) = wake_tasks.remove(&(id, day)) {
old_handle.abort();
} }
} }
_ => {} _ => {}
@ -181,7 +180,11 @@ fn next_alarm(now: DateTime<Local>, day: Weekday, time: NaiveTime) -> DateTime<L
let day_now = now.weekday().num_days_from_monday() as i64; let day_now = now.weekday().num_days_from_monday() as i64;
let alarm = now + chrono::Duration::days(day_of_alarm - day_now); let alarm = now + chrono::Duration::days(day_of_alarm - day_now);
let mut alarm = alarm.date().and_time(time).unwrap(); let mut alarm = alarm
.date_naive()
.and_time(time)
.and_local_timezone(Local)
.unwrap();
if alarm <= now { if alarm <= now {
alarm += chrono::Duration::weeks(1); alarm += chrono::Duration::weeks(1);

View File

@ -19,7 +19,7 @@ pub struct ColorPicker {
#[derive(Default)] #[derive(Default)]
enum ColorPickerSetting { enum ColorPickerSetting {
#[default] #[default]
HSB, Hsb,
Kelvin, Kelvin,
} }
@ -55,14 +55,14 @@ impl ColorPicker {
} }
match self.dragging.take() { match self.dragging.take() {
Some(ColorPickerAttr::HueSat) => self.mode = ColorPickerSetting::HSB, Some(ColorPickerAttr::HueSat) => self.mode = ColorPickerSetting::Hsb,
Some(ColorPickerAttr::Brightness) => {} Some(ColorPickerAttr::Brightness) => {}
Some(ColorPickerAttr::Temperature) => self.mode = ColorPickerSetting::Kelvin, Some(ColorPickerAttr::Temperature) => self.mode = ColorPickerSetting::Kelvin,
None => return, None => return,
} }
let color = match self.mode { let color = match self.mode {
ColorPickerSetting::HSB => { ColorPickerSetting::Hsb => {
BulbColor::hsb(self.hue, self.saturation, self.brightness) BulbColor::hsb(self.hue, self.saturation, self.brightness)
} }
ColorPickerSetting::Kelvin => { ColorPickerSetting::Kelvin => {
@ -130,10 +130,12 @@ impl ColorPicker {
let (r, g, b) = hsb_to_rgb(self.hue, 1.0, 1.0); let (r, g, b) = hsb_to_rgb(self.hue, 1.0, 1.0);
let saturation_gradient = match self.mode { let saturation_gradient = match self.mode {
ColorPickerSetting::HSB => { ColorPickerSetting::Hsb => {
format!("background: linear-gradient(0deg, #000, rgba({r},{g},{b},1));") format!("background: linear-gradient(0deg, #000, rgba({r},{g},{b},1));")
} }
ColorPickerSetting::Kelvin => format!("background: linear-gradient(0deg, #000, #fff);"), ColorPickerSetting::Kelvin => {
"background: linear-gradient(0deg, #000, #fff);".to_string()
}
}; };
div![ div![
@ -186,7 +188,7 @@ impl ColorPicker {
self.hue = h; self.hue = h;
self.saturation = s; self.saturation = s;
self.brightness = b; self.brightness = b;
self.mode = ColorPickerSetting::HSB; self.mode = ColorPickerSetting::Hsb;
} }
pub fn set_kelvin(&mut self, t: f32, b: f32) { pub fn set_kelvin(&mut self, t: f32, b: f32) {

View File

@ -112,7 +112,7 @@ impl Page for Model {
} }
Msg::ColorPicker(msg) => { Msg::ColorPicker(msg) => {
self.color_picker self.color_picker
.update(msg, &mut orders.proxy(|msg| Msg::ColorPicker(msg))); .update(msg, &mut orders.proxy(Msg::ColorPicker));
} }
Msg::SetBulbPower(power) => { Msg::SetBulbPower(power) => {
self.groups_interacted = true; self.groups_interacted = true;
@ -125,7 +125,7 @@ impl Page for Model {
}); });
} }
Msg::LightTime(time, day) => { Msg::LightTime(time, day) => {
if time == "" { if time.is_empty() {
self.for_selected_bulbs(|id, _| { self.for_selected_bulbs(|id, _| {
let message = ClientMessage::SetBulbWakeTime { let message = ClientMessage::SetBulbWakeTime {
id: id.clone(), id: id.clone(),
@ -259,9 +259,7 @@ impl Page for Model {
div![ div![
C![C.bulb_controls], C![C.bulb_controls],
IF!(selected_bulb.is_none() => C![C.bulb_controls_disable]), IF!(selected_bulb.is_none() => C![C.bulb_controls_disable]),
self.color_picker self.color_picker.view().map_msg(Msg::ColorPicker),
.view()
.map_msg(|msg| Msg::ColorPicker(msg)),
button![ button![
if selected_bulb.map(|b| b.mode.power).unwrap_or(false) { if selected_bulb.map(|b| b.mode.power).unwrap_or(false) {
C![C.bulb_power_button, C.bulb_power_button_on] C![C.bulb_power_button, C.bulb_power_button_on]