diff --git a/Cargo.toml b/Cargo.toml index 577fc5e..6402c54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,21 +8,21 @@ edition = "2021" [dependencies] angular-units = "0.2.4" dirs = "4.0.0" -gio = "0.14.8" -gtk = "0.14.3" -log = "0.4.14" -miette = { version = "3.2.0", features = ["fancy"] } +gio = "0.17.3" +gtk = "0.16.1" +log = "0.4.17" +miette = { version = "5.5.0", features = ["fancy"] } prisma = "0.1.1" -relm = "0.22.0" -relm-derive = "0.22.0" -reqwest = "0.11.6" +relm = "0.24.0" +relm-derive = "0.24.0" +reqwest = "0.11.14" rhue = { git = "https://mzte.de/git/lordmzte/rhue.git" } -serde = { version = "1.0.130", features = ["derive"] } -serde_json = "1.0.68" -simplelog = "0.10.2" -tokio = { version = "1.12.0", features = ["rt-multi-thread", "macros", "net", "sync", "fs"] } -url = { version = "2.2.2", features = ["serde"] } +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.94" +simplelog = "0.12.1" +tokio = { version = "1.26.0", features = ["rt-multi-thread", "macros", "net", "sync", "fs"] } +url = { version = "2.3.1", features = ["serde"] } [build-dependencies] -gio = "0.14.8" +glib-build-tools = "0.17.0" diff --git a/build.rs b/build.rs index c807327..2fb52ed 100644 --- a/build.rs +++ b/build.rs @@ -1,6 +1,6 @@ fn main() { - gio::compile_resources( - "resources", + glib_build_tools::compile_resources( + &["resources"], "resources/resources.gresource.xml", "compiled.gresource", ); diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 1ef330e..25d84ad 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -70,7 +70,7 @@ impl Widget for Win { Msg::PropertyChanged(prop) => { let rgba = self.widgets.color_chooser.rgba(); - let rgb = Rgb::new(rgba.red, rgba.green, rgba.blue); + let rgb = Rgb::new(rgba.red(), rgba.green(), rgba.blue()); let mut hsv = Hsv::<_, Turns<_>>::from(rgb); if prop == LightProperty::Brightness { @@ -124,7 +124,7 @@ impl Widget for Win { Msg::SetLights(lights) => { let mut lights = lights.into_iter().collect::>(); - lights.sort_by(|&(ref a, _), &(ref b, _)| a.cmp(b)); + lights.sort_by(|(a, _), (b, _)| a.cmp(b)); for c in self.widgets.lights_list.children() { self.widgets.lights_list.remove(&c); diff --git a/src/main.rs b/src/main.rs index 8b35146..05e04f3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,6 @@ async fn main() -> miette::Result<()> { LevelFilter::Info }, simplelog::ConfigBuilder::new() - .set_time_to_local(true) .set_location_level(LevelFilter::Error) .build(), simplelog::TerminalMode::Stdout, @@ -45,7 +44,7 @@ async fn main() -> miette::Result<()> { bridge_addr .map(|u| u.to_string()) .unwrap_or_else(String::new), - bridge_username.unwrap_or_else(String::new), + bridge_username.unwrap_or_default(), )) .into_diagnostic() .wrap_err("Window crashed :(")?; diff --git a/src/runtime.rs b/src/runtime.rs index ea3ee99..e3254cf 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -64,7 +64,7 @@ impl Runtime { }, Ok(true) => { - let _ = quit_ch.send(()); + let _ = quit_ch.send(()).await; }, _ => {},