Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions backend/src/daemon/dummy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ impl BoardDummy {
.leds
.values()
.flatten()
.find(|i| **i == index)
.is_some()
.any(|i| *i == index)
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions backend/src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ impl Key {
.layout()
.leds
.get(logical_name.as_str())
.map_or(Vec::new(), |x| x.clone());
.cloned()
.unwrap_or_default();
debug!(" LEDs: {:?}", leds);

let mut led_name = String::new();
for led in leds.iter() {
for led in &leds {
if !led_name.is_empty() {
led_name.push_str(", ");
}
Expand Down Expand Up @@ -92,7 +93,7 @@ impl Key {
}

let mut led_color = None;
if board.layout().meta.has_mode && leds.len() > 0 {
if board.layout().meta.has_mode && !leds.is_empty() {
match daemon.color(board.board(), leds[0]) {
Ok((0, 0, 0)) => {}
Ok((r, g, b)) => led_color = Some(Rgb::new(r, g, b).to_hs_lossy()),
Expand Down
2 changes: 1 addition & 1 deletion backend/src/keymap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mod hs_map_serde {
) -> Result<S::Ok, S::Error> {
let map = map
.iter()
.map(|(k, hs)| (k, hs.map(|hs| hs.to_ints())))
.map(|(k, hs)| (k, hs.map(Hs::to_ints)))
.collect::<HashMap<_, _>>();
map.serialize(serializer)
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/layout/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ mod tests {
.physical
.keys
.iter()
.map(|i| i.logical_name())
.map(PhysicalLayoutKey::logical_name)
.collect::<HashSet<_>>();
let logical_in_layout = layout.layout.keys().cloned().collect::<HashSet<_>>();
let logical_in_leds = layout.layout.keys().cloned().collect::<HashSet<_>>();
Expand Down