From 5c159d22944abbef669165c730655a65273d69ee Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Mon, 3 Jul 2023 20:07:33 +1200
Subject: [PATCH] Set toolchain to stable

---
 asusd-user/src/zbus_anime.rs  |  5 ++++-
 rog-aura/src/builtin_modes.rs | 18 ++++++------------
 rust-toolchain                |  2 +-
 simulators/src/simulator.rs   |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/asusd-user/src/zbus_anime.rs b/asusd-user/src/zbus_anime.rs
index 793f373b..dce9be0e 100644
--- a/asusd-user/src/zbus_anime.rs
+++ b/asusd-user/src/zbus_anime.rs
@@ -23,7 +23,10 @@
 
 use zbus::dbus_proxy;
 
-#[dbus_proxy(interface = "org.asuslinux.Daemon")]
+#[dbus_proxy(
+    interface = "org.asuslinux.Daemon",
+    default_path = "/org/asuslinux/Anime"
+)]
 trait Daemon {
     /// InsertAsusGif method
     fn insert_asus_gif(
diff --git a/rog-aura/src/builtin_modes.rs b/rog-aura/src/builtin_modes.rs
index 37cdd18d..feeec853 100644
--- a/rog-aura/src/builtin_modes.rs
+++ b/rog-aura/src/builtin_modes.rs
@@ -99,17 +99,14 @@ impl From<Colour> for [u8; 3] {
 
 #[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum Speed {
     Low = 0xe1,
+    #[default]
     Med = 0xeb,
     High = 0xf5,
 }
-impl Default for Speed {
-    fn default() -> Self {
-        Speed::Med
-    }
-}
+
 impl FromStr for Speed {
     type Err = Error;
 
@@ -138,18 +135,15 @@ impl From<Speed> for u8 {
 /// Enum corresponds to the required integer value
 #[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum Direction {
+    #[default]
     Right,
     Left,
     Up,
     Down,
 }
-impl Default for Direction {
-    fn default() -> Self {
-        Direction::Right
-    }
-}
+
 impl FromStr for Direction {
     type Err = Error;
 
diff --git a/rust-toolchain b/rust-toolchain
index 77fd5b28..3d5286f8 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -5,5 +5,5 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.65.0"
+channel = "stable"
 components = [ "rustfmt", "clippy" ]
diff --git a/simulators/src/simulator.rs b/simulators/src/simulator.rs
index 6490bedb..c719ffd9 100644
--- a/simulators/src/simulator.rs
+++ b/simulators/src/simulator.rs
@@ -155,7 +155,7 @@ fn main() -> Result<(), Box<dyn Error>> {
                     }
                 }
                 for (x_count, b) in dev.buffer[start..=end].iter().enumerate() {
-                    canvas.set_draw_color(Color::RGB(*b as u8, *b as u8, *b as u8));
+                    canvas.set_draw_color(Color::RGB(*b, *b, *b));
 
                     let x: i32 = w + x_count as i32 * w
                         - if (y_count + y_offset as usize) % 2 != 0 {