diff --git a/asusctl/examples/anime-gif.rs b/asusctl/examples/anime-gif.rs index a205c1ac..847d04c6 100644 --- a/asusctl/examples/anime-gif.rs +++ b/asusctl/examples/anime-gif.rs @@ -21,14 +21,11 @@ fn main() { let brightness = args[2].parse::().unwrap(); let anime_type = get_anime_type(); let mut seq = Sequences::new(anime_type); - seq.insert( - 0, - &ActionLoader::AsusAnimation { - file: path.into(), - time: rog_anime::AnimTime::Infinite, - brightness, - }, - ) + seq.insert(0, &ActionLoader::AsusAnimation { + file: path.into(), + time: rog_anime::AnimTime::Infinite, + brightness, + }) .unwrap(); loop { diff --git a/asusd/src/asus_armoury.rs b/asusd/src/asus_armoury.rs index 71639b23..bb78130e 100644 --- a/asusd/src/asus_armoury.rs +++ b/asusd/src/asus_armoury.rs @@ -91,7 +91,8 @@ impl AsusArmouryAttribute { .await; } else { info!( - "inotify event stream failed for {} ({}). You can ignore this if unsupported", + "inotify event stream failed for {} ({}). You can ignore this \ + if unsupported", name, $attr_str ); } diff --git a/asusd/src/aura_laptop/config.rs b/asusd/src/aura_laptop/config.rs index 956f6a46..326602af 100644 --- a/asusd/src/aura_laptop/config.rs +++ b/asusd/src/aura_laptop/config.rs @@ -295,38 +295,26 @@ mod tests { let res = config.multizone.unwrap(); let sta = res.get(&AuraModeNum::Static).unwrap(); assert_eq!(sta.len(), 4); - assert_eq!( - sta[0].colour1, - Colour { - r: 0xff, - g: 0x00, - b: 0xff - } - ); - assert_eq!( - sta[1].colour1, - Colour { - r: 0x00, - g: 0xff, - b: 0xff - } - ); - assert_eq!( - sta[2].colour1, - Colour { - r: 0xff, - g: 0xff, - b: 0x00 - } - ); - assert_eq!( - sta[3].colour1, - Colour { - r: 0x00, - g: 0xff, - b: 0x00 - } - ); + assert_eq!(sta[0].colour1, Colour { + r: 0xff, + g: 0x00, + b: 0xff + }); + assert_eq!(sta[1].colour1, Colour { + r: 0x00, + g: 0xff, + b: 0xff + }); + assert_eq!(sta[2].colour1, Colour { + r: 0xff, + g: 0xff, + b: 0x00 + }); + assert_eq!(sta[3].colour1, Colour { + r: 0x00, + g: 0xff, + b: 0x00 + }); } #[test] @@ -384,28 +372,22 @@ mod tests { assert_eq!(config.brightness, LedBrightness::Med); assert_eq!(config.builtins.len(), 5); - assert_eq!( - config.builtins.first_entry().unwrap().get(), - &AuraEffect { - mode: AuraModeNum::Static, - zone: AuraZone::None, - colour1: Colour { r: 166, g: 0, b: 0 }, - colour2: Colour { r: 0, g: 0, b: 0 }, - speed: Speed::Med, - direction: Direction::Right - } - ); + assert_eq!(config.builtins.first_entry().unwrap().get(), &AuraEffect { + mode: AuraModeNum::Static, + zone: AuraZone::None, + colour1: Colour { r: 166, g: 0, b: 0 }, + colour2: Colour { r: 0, g: 0, b: 0 }, + speed: Speed::Med, + direction: Direction::Right + }); assert_eq!(config.enabled.states.len(), 1); - assert_eq!( - config.enabled.states[0], - AuraPowerState { - zone: PowerZones::KeyboardAndLightbar, - boot: true, - awake: true, - sleep: true, - shutdown: true - } - ); + assert_eq!(config.enabled.states[0], AuraPowerState { + zone: PowerZones::KeyboardAndLightbar, + boot: true, + awake: true, + sleep: true, + shutdown: true + }); } #[test] @@ -415,27 +397,21 @@ mod tests { assert_eq!(config.brightness, LedBrightness::Med); assert_eq!(config.builtins.len(), 12); - assert_eq!( - config.builtins.first_entry().unwrap().get(), - &AuraEffect { - mode: AuraModeNum::Static, - zone: AuraZone::None, - colour1: Colour { r: 166, g: 0, b: 0 }, - colour2: Colour { r: 0, g: 0, b: 0 }, - speed: Speed::Med, - direction: Direction::Right - } - ); + assert_eq!(config.builtins.first_entry().unwrap().get(), &AuraEffect { + mode: AuraModeNum::Static, + zone: AuraZone::None, + colour1: Colour { r: 166, g: 0, b: 0 }, + colour2: Colour { r: 0, g: 0, b: 0 }, + speed: Speed::Med, + direction: Direction::Right + }); assert_eq!(config.enabled.states.len(), 4); - assert_eq!( - config.enabled.states[0], - AuraPowerState { - zone: PowerZones::Keyboard, - boot: true, - awake: true, - sleep: true, - shutdown: true - } - ); + assert_eq!(config.enabled.states[0], AuraPowerState { + zone: PowerZones::Keyboard, + boot: true, + awake: true, + sleep: true, + shutdown: true + }); } } diff --git a/rog-aura/src/effects/mod.rs b/rog-aura/src/effects/mod.rs index 0fbc7cb9..5b3f2163 100644 --- a/rog-aura/src/effects/mod.rs +++ b/rog-aura/src/effects/mod.rs @@ -207,14 +207,12 @@ mod tests { fn single_key_next_state_then_create() { let layout = KeyLayout::default_layout(); let mut seq = AdvancedEffects::new(false); - seq.effects.push(Effect::Static(Static::new( - LedCode::F, - Colour { + seq.effects + .push(Effect::Static(Static::new(LedCode::F, Colour { r: 255, g: 127, b: 0, - }, - ))); + }))); seq.next_state(&layout); let packets = seq.create_packets(); diff --git a/rog-aura/src/keyboard/layouts.rs b/rog-aura/src/keyboard/layouts.rs index 4a363128..b3b3b91f 100644 --- a/rog-aura/src/keyboard/layouts.rs +++ b/rog-aura/src/keyboard/layouts.rs @@ -335,117 +335,93 @@ impl KeyLayout { KeyShape::new_led(1.0, 1.0, 0.1, 0.1, 0.1, 0.1), )]), key_rows: vec![ - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::Esc, "regular".to_owned()), - (LedCode::F1, "regular".to_owned()), - (LedCode::F2, "regular".to_owned()), - (LedCode::F3, "regular".to_owned()), - (LedCode::F4, "regular".to_owned()), - // not sure which key to put here - (LedCode::F5, "regular".to_owned()), - (LedCode::F6, "regular".to_owned()), - (LedCode::F7, "regular".to_owned()), - (LedCode::F8, "regular".to_owned()), - (LedCode::F9, "regular".to_owned()), - (LedCode::F10, "regular".to_owned()), - (LedCode::F11, "regular".to_owned()), - (LedCode::F12, "regular".to_owned()), - ], - ), - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::Tilde, "regular".to_owned()), - (LedCode::N1, "regular".to_owned()), - (LedCode::N2, "regular".to_owned()), - (LedCode::N3, "regular".to_owned()), - (LedCode::N4, "regular".to_owned()), - (LedCode::N5, "regular".to_owned()), - (LedCode::N6, "regular".to_owned()), - (LedCode::N7, "regular".to_owned()), - (LedCode::N8, "regular".to_owned()), - (LedCode::N9, "regular".to_owned()), - (LedCode::N0, "regular".to_owned()), - (LedCode::Hyphen, "regular".to_owned()), - (LedCode::Equals, "regular".to_owned()), - (LedCode::Backspace, "regular".to_owned()), - ], - ), - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::Tab, "regular".to_owned()), - (LedCode::Q, "regular".to_owned()), - (LedCode::W, "regular".to_owned()), - (LedCode::E, "regular".to_owned()), - (LedCode::R, "regular".to_owned()), - (LedCode::T, "regular".to_owned()), - (LedCode::Y, "regular".to_owned()), - (LedCode::U, "regular".to_owned()), - (LedCode::I, "regular".to_owned()), - (LedCode::O, "regular".to_owned()), - (LedCode::P, "regular".to_owned()), - (LedCode::LBracket, "regular".to_owned()), - (LedCode::RBracket, "regular".to_owned()), - (LedCode::BackSlash, "regular".to_owned()), - ], - ), - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::Caps, "regular".to_owned()), - (LedCode::A, "regular".to_owned()), - (LedCode::S, "regular".to_owned()), - (LedCode::D, "regular".to_owned()), - (LedCode::F, "regular".to_owned()), - (LedCode::G, "regular".to_owned()), - (LedCode::H, "regular".to_owned()), - (LedCode::J, "regular".to_owned()), - (LedCode::K, "regular".to_owned()), - (LedCode::L, "regular".to_owned()), - (LedCode::SemiColon, "regular".to_owned()), - (LedCode::Quote, "regular".to_owned()), - (LedCode::Return, "regular".to_owned()), - ], - ), - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::LShift, "regular".to_owned()), - (LedCode::Z, "regular".to_owned()), - (LedCode::X, "regular".to_owned()), - (LedCode::C, "regular".to_owned()), - (LedCode::V, "regular".to_owned()), - (LedCode::B, "regular".to_owned()), - (LedCode::N, "regular".to_owned()), - (LedCode::M, "regular".to_owned()), - (LedCode::Comma, "regular".to_owned()), - (LedCode::Period, "regular".to_owned()), - (LedCode::FwdSlash, "regular".to_owned()), - (LedCode::Rshift, "regular".to_owned()), - ], - ), - KeyRow::new( - 0.1, - 0.1, - vec![ - (LedCode::LCtrl, "regular".to_owned()), - (LedCode::LFn, "regular".to_owned()), - (LedCode::Meta, "regular".to_owned()), - (LedCode::LAlt, "regular".to_owned()), - (LedCode::Spacebar, "regular".to_owned()), - (LedCode::RAlt, "regular".to_owned()), - (LedCode::PrtSc, "regular".to_owned()), - (LedCode::RCtrl, "regular".to_owned()), - ], - ), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::Esc, "regular".to_owned()), + (LedCode::F1, "regular".to_owned()), + (LedCode::F2, "regular".to_owned()), + (LedCode::F3, "regular".to_owned()), + (LedCode::F4, "regular".to_owned()), + // not sure which key to put here + (LedCode::F5, "regular".to_owned()), + (LedCode::F6, "regular".to_owned()), + (LedCode::F7, "regular".to_owned()), + (LedCode::F8, "regular".to_owned()), + (LedCode::F9, "regular".to_owned()), + (LedCode::F10, "regular".to_owned()), + (LedCode::F11, "regular".to_owned()), + (LedCode::F12, "regular".to_owned()), + ]), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::Tilde, "regular".to_owned()), + (LedCode::N1, "regular".to_owned()), + (LedCode::N2, "regular".to_owned()), + (LedCode::N3, "regular".to_owned()), + (LedCode::N4, "regular".to_owned()), + (LedCode::N5, "regular".to_owned()), + (LedCode::N6, "regular".to_owned()), + (LedCode::N7, "regular".to_owned()), + (LedCode::N8, "regular".to_owned()), + (LedCode::N9, "regular".to_owned()), + (LedCode::N0, "regular".to_owned()), + (LedCode::Hyphen, "regular".to_owned()), + (LedCode::Equals, "regular".to_owned()), + (LedCode::Backspace, "regular".to_owned()), + ]), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::Tab, "regular".to_owned()), + (LedCode::Q, "regular".to_owned()), + (LedCode::W, "regular".to_owned()), + (LedCode::E, "regular".to_owned()), + (LedCode::R, "regular".to_owned()), + (LedCode::T, "regular".to_owned()), + (LedCode::Y, "regular".to_owned()), + (LedCode::U, "regular".to_owned()), + (LedCode::I, "regular".to_owned()), + (LedCode::O, "regular".to_owned()), + (LedCode::P, "regular".to_owned()), + (LedCode::LBracket, "regular".to_owned()), + (LedCode::RBracket, "regular".to_owned()), + (LedCode::BackSlash, "regular".to_owned()), + ]), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::Caps, "regular".to_owned()), + (LedCode::A, "regular".to_owned()), + (LedCode::S, "regular".to_owned()), + (LedCode::D, "regular".to_owned()), + (LedCode::F, "regular".to_owned()), + (LedCode::G, "regular".to_owned()), + (LedCode::H, "regular".to_owned()), + (LedCode::J, "regular".to_owned()), + (LedCode::K, "regular".to_owned()), + (LedCode::L, "regular".to_owned()), + (LedCode::SemiColon, "regular".to_owned()), + (LedCode::Quote, "regular".to_owned()), + (LedCode::Return, "regular".to_owned()), + ]), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::LShift, "regular".to_owned()), + (LedCode::Z, "regular".to_owned()), + (LedCode::X, "regular".to_owned()), + (LedCode::C, "regular".to_owned()), + (LedCode::V, "regular".to_owned()), + (LedCode::B, "regular".to_owned()), + (LedCode::N, "regular".to_owned()), + (LedCode::M, "regular".to_owned()), + (LedCode::Comma, "regular".to_owned()), + (LedCode::Period, "regular".to_owned()), + (LedCode::FwdSlash, "regular".to_owned()), + (LedCode::Rshift, "regular".to_owned()), + ]), + KeyRow::new(0.1, 0.1, vec![ + (LedCode::LCtrl, "regular".to_owned()), + (LedCode::LFn, "regular".to_owned()), + (LedCode::Meta, "regular".to_owned()), + (LedCode::LAlt, "regular".to_owned()), + (LedCode::Spacebar, "regular".to_owned()), + (LedCode::RAlt, "regular".to_owned()), + (LedCode::PrtSc, "regular".to_owned()), + (LedCode::RCtrl, "regular".to_owned()), + ]), ], } } diff --git a/rog-platform/src/cpu.rs b/rog-platform/src/cpu.rs index 42a48a86..332bf6a4 100644 --- a/rog-platform/src/cpu.rs +++ b/rog-platform/src/cpu.rs @@ -267,24 +267,18 @@ mod tests { fn check_cpu() { let cpu = CPUControl::new().unwrap(); assert_eq!(cpu.get_governor().unwrap(), CPUGovernor::Powersave); - assert_eq!( - cpu.get_available_governors().unwrap(), - vec![ - CPUGovernor::Performance, - CPUGovernor::Powersave - ] - ); + assert_eq!(cpu.get_available_governors().unwrap(), vec![ + CPUGovernor::Performance, + CPUGovernor::Powersave + ]); assert_eq!(cpu.get_epp().unwrap(), CPUEPP::BalancePower); - assert_eq!( - cpu.get_available_epp().unwrap(), - vec![ - CPUEPP::Default, - CPUEPP::Performance, - CPUEPP::BalancePerformance, - CPUEPP::BalancePower, - CPUEPP::Power, - ] - ); + assert_eq!(cpu.get_available_epp().unwrap(), vec![ + CPUEPP::Default, + CPUEPP::Performance, + CPUEPP::BalancePerformance, + CPUEPP::BalancePower, + CPUEPP::Power, + ]); } }