Clippy run

rog-aura/src/builtin_modes.rs

@@ -12,7 +12,7 @@ use zvariant::Type;
 use crate::{error::Error, LED_MSG_LEN};
 
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum LedBrightness {
     Off,
     Low,
@@ -33,7 +33,7 @@ impl From<u32> for LedBrightness {
 }
 
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Debug, Clone, PartialEq, PartialOrd, Copy, Deserialize, Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Copy, Deserialize, Serialize)]
 pub struct Colour(pub u8, pub u8, pub u8);
 
 impl Default for Colour {
@@ -85,7 +85,7 @@ impl From<Colour> for [u8; 3] {
 }
 
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum Speed {
     Low = 0xe1,
     Med = 0xeb,
@@ -123,7 +123,7 @@ impl From<Speed> for u8 {
 ///
 /// Enum corresponds to the required integer value
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum Direction {
     Right,
     Left,
@@ -251,7 +251,7 @@ impl From<u8> for AuraModeNum {
 
 /// Base effects have no zoning, while multizone is 1-4
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Debug, Default, Copy, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum AuraZone {
     /// Used if keyboard has no zones, or if setting all
     #[default]

rog-aura/src/keys.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Default, PartialEq, Copy, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Serialize, Deserialize)]
 pub enum Key {
     VolUp,
     VolDown,
@@ -235,51 +235,44 @@ impl KeyShape {
     /// A blank is used to space keys out in GUI's and can be used or ignored
     /// depednign on the per-key effect
     pub const fn is_blank(&self) -> bool {
-        match self {
+        matches!(
+            self,
             Self::NormalBlank
-            | Self::FuncBlank
-            | Self::ArrowBlank
-            | Self::ArrowSplitBlank
-            | Self::ArrowRegularBlank => true,
-            _ => false,
-        }
+                | Self::FuncBlank
+                | Self::ArrowBlank
+                | Self::ArrowSplitBlank
+                | Self::ArrowRegularBlank
+        )
     }
 
     /// A spacer is used to space keys out in GUI's, but ignored in per-key effects
     pub const fn is_spacer(&self) -> bool {
-        match self {
+        matches!(
+            self,
             Self::FuncSpacer
-            | Self::NormalSpacer
-            | Self::ArrowSpacer
-            | Self::ArrowSplitSpacer
-            | Self::ArrowRegularSpacer => true,
-            _ => false,
-        }
+                | Self::NormalSpacer
+                | Self::ArrowSpacer
+                | Self::ArrowSplitSpacer
+                | Self::ArrowRegularSpacer
+        )
     }
 
     /// All keys with a postfix of some number
     pub const fn is_group(&self) -> bool {
-        match self {
-            Self::LShift3 | Self::RShift3 => true,
-            Self::Return3 | Self::Space5 | Self::Backspace3 => true,
-            _ => false,
-        }
+        matches!(
+            self,
+            Self::LShift3 | Self::RShift3 | Self::Return3 | Self::Space5 | Self::Backspace3
+        )
     }
 
     /// Mostly intended as a helper for signalling when to draw a
     /// split/compact arrow cluster
     pub const fn is_arrow_cluster(&self) -> bool {
-        match self {
-            Self::Arrow | Self::ArrowBlank | Self::ArrowSpacer => true,
-            _ => false,
-        }
+        matches!(self, Self::Arrow | Self::ArrowBlank | Self::ArrowSpacer)
     }
 
     pub const fn is_arrow_splits(&self) -> bool {
-        match self {
-            Self::ArrowSplit | Self::ArrowSplitBlank | Self::ArrowSplitSpacer => true,
-            _ => false,
-        }
+        matches!(self, Self::Arrow | Self::ArrowBlank | Self::ArrowSpacer)
     }
 }
 

rog-aura/src/layouts/mod.rs

@@ -35,9 +35,9 @@ impl KeyLayout {
         let mut buf = String::new();
         let read_len = file.read_to_string(&mut buf)?;
         if read_len == 0 {
-            return Err(Error::Io(std::io::ErrorKind::InvalidData.into()));
+            Err(Error::Io(std::io::ErrorKind::InvalidData.into()))
         } else {
-            return Ok(toml::from_str::<Self>(&buf)?);
+            Ok(toml::from_str::<Self>(&buf)?)
         }
     }
 

rog-aura/src/sequencer/effects.rs

@@ -138,16 +138,15 @@ impl EffectState for Breathe {
 
         let speed = 4 - <u8>::from(*speed);
 
-        let colour: &mut Colour;
         if *colour_actual == Colour(0, 0, 0) {
             *use_colour1 = !*use_colour1;
         }
 
-        if !*use_colour1 {
-            colour = colour2;
+        let colour = if !*use_colour1 {
+            colour2
         } else {
-            colour = colour1;
-        }
+            colour1
+        };
 
         let r1_scale = colour.0 / speed / 2;
         let g1_scale = colour.1 / speed / 2;

rog-aura/src/usb.rs

@@ -21,7 +21,7 @@ pub const fn aura_brightness_bytes(brightness: u8) -> [u8; 17] {
 }
 
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Clone, Debug, PartialEq, PartialOrd, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Serialize, Deserialize, Default)]
 pub enum AuraDevice {
     Tuf,
     X1854,
@@ -127,7 +127,7 @@ impl BitOr<AuraDev1866> for AuraDev1866 {
     type Output = u32;
 
     fn bitor(self, rhs: AuraDev1866) -> Self::Output {
-        return self as u32 | rhs as u32;
+        self as u32 | rhs as u32
     }
 }
 
@@ -135,7 +135,7 @@ impl BitAnd<AuraDev1866> for AuraDev1866 {
     type Output = u32;
 
     fn bitand(self, rhs: AuraDev1866) -> Self::Output {
-        return self as u32 & rhs as u32;
+        self as u32 & rhs as u32
     }
 }
 
@@ -178,14 +178,14 @@ pub enum AuraDev19b6 {
     SleepKeyb = 1 << 5,
     ShutdownLogo = 1 << 6,
     ShutdownKeyb = 1 << 7,
-    BootBar = 1 << 7 + 2,
-    AwakeBar = 1 << 7 + 3,
-    SleepBar = 1 << 7 + 4,
-    ShutdownBar = 1 << 7 + 5,
-    BootLid = 1 << 15 + 1,
-    AwakeLid = 1 << 15 + 2,
-    SleepLid = 1 << 15 + 3,
-    ShutdownLid = 1 << 15 + 4,
+    BootBar = 1 << (7 + 2),
+    AwakeBar = 1 << (7 + 3),
+    SleepBar = 1 << (7 + 4),
+    ShutdownBar = 1 << (7 + 5),
+    BootLid = 1 << (15 + 1),
+    AwakeLid = 1 << (15 + 2),
+    SleepLid = 1 << (15 + 3),
+    ShutdownLid = 1 << (15 + 4),
 }
 
 impl From<AuraDev19b6> for u32 {
@@ -216,7 +216,7 @@ impl BitOr<AuraDev19b6> for AuraDev19b6 {
     type Output = u16;
 
     fn bitor(self, rhs: AuraDev19b6) -> Self::Output {
-        return self as u16 | rhs as u16;
+        self as u16 | rhs as u16
     }
 }
 
@@ -224,7 +224,7 @@ impl BitAnd<AuraDev19b6> for AuraDev19b6 {
     type Output = u16;
 
     fn bitand(self, rhs: AuraDev19b6) -> Self::Output {
-        return self as u16 & rhs as u16;
+        self as u16 & rhs as u16
     }
 }