From b9ed39f85b5e02020d35610eb826773e3c024953 Mon Sep 17 00:00:00 2001 From: dashie Date: Mon, 11 Dec 2023 22:01:20 +0000 Subject: [PATCH] chore: Fix warning --- src/components/input/output_stream_entry_impl.rs | 2 +- src/components/input/source_box_impl.rs | 2 +- src/components/output/input_stream_entry_impl.rs | 2 +- src/components/output/sink_box_impl.rs | 2 +- src/components/output/sink_entry_impl.rs | 2 +- src/components/wifi/wifi_options.rs | 11 +++++------ 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/components/input/output_stream_entry_impl.rs b/src/components/input/output_stream_entry_impl.rs index 037562d..15687b2 100644 --- a/src/components/input/output_stream_entry_impl.rs +++ b/src/components/input/output_stream_entry_impl.rs @@ -7,7 +7,7 @@ use std::time::SystemTime; use crate::components::input::output_stream_entry; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale}; +use gtk::{glib, Button, CompositeTemplate, Label, Scale}; #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")] diff --git a/src/components/input/source_box_impl.rs b/src/components/input/source_box_impl.rs index 61bb3fa..b087434 100644 --- a/src/components/input/source_box_impl.rs +++ b/src/components/input/source_box_impl.rs @@ -9,7 +9,7 @@ use crate::components::base::list_entry::ListEntry; use crate::components::input::source_box; use gtk::subclass::prelude::*; use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild}; -use gtk::{prelude::*, Button, Label, ProgressBar, Scale}; +use gtk::{prelude::*, Button, Label, Scale}; use super::output_stream_entry::OutputStreamEntry; use super::source_entry::SourceEntry; diff --git a/src/components/output/input_stream_entry_impl.rs b/src/components/output/input_stream_entry_impl.rs index e48cad4..acdf98f 100644 --- a/src/components/output/input_stream_entry_impl.rs +++ b/src/components/output/input_stream_entry_impl.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use std::time::SystemTime; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale}; +use gtk::{glib, Button, CompositeTemplate, Label, Scale}; use super::input_stream_entry; diff --git a/src/components/output/sink_box_impl.rs b/src/components/output/sink_box_impl.rs index 464f96d..64d0fa9 100644 --- a/src/components/output/sink_box_impl.rs +++ b/src/components/output/sink_box_impl.rs @@ -9,7 +9,7 @@ use crate::components::base::list_entry::ListEntry; use crate::components::output::input_stream_entry::InputStreamEntry; use gtk::subclass::prelude::*; use gtk::{glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild}; -use gtk::{prelude::*, ProgressBar, Scale}; +use gtk::{prelude::*, Scale}; use super::sink_box; use super::sink_entry::SinkEntry; diff --git a/src/components/output/sink_entry_impl.rs b/src/components/output/sink_entry_impl.rs index fc29adb..f51bc7d 100644 --- a/src/components/output/sink_entry_impl.rs +++ b/src/components/output/sink_entry_impl.rs @@ -7,7 +7,7 @@ use std::time::SystemTime; use crate::components::output::sink_entry; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale}; +use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, Scale}; #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")] diff --git a/src/components/wifi/wifi_options.rs b/src/components/wifi/wifi_options.rs index 4d05d38..0da08f8 100644 --- a/src/components/wifi/wifi_options.rs +++ b/src/components/wifi/wifi_options.rs @@ -130,7 +130,7 @@ impl WifiOptions { self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway); // Security - if let TypeSettings::WIFI(wifi, wifi_security) = &conn.device { + if let TypeSettings::WIFI(_, wifi_security) = &conn.device { match wifi_security.key_management { KeyManagement::NONE => { self_imp.reset_wifi_security_dropdown.set_selected(0); @@ -353,12 +353,12 @@ fn setup_callbacks(wifi_options: &Arc, path: Path<'static>) { let mut conn = imp.connection.borrow_mut(); match (selected, &mut conn.device) { - (0 , TypeSettings::WIFI(wifi, wifi_security)) => { // None + (0 , TypeSettings::WIFI(_, wifi_security)) => { // None imp.reset_wifi_password.set_visible(false); wifi_security.key_management = KeyManagement::NONE; wifi_security.authentication_algorithm = String::from("none"); }, - (1 , TypeSettings::WIFI(wifi, wifi_security)) => { // WPA/WPA2 Personal + (1 , TypeSettings::WIFI(_, wifi_security)) => { // WPA/WPA2 Personal imp.reset_wifi_password.set_visible(true); wifi_security.key_management = KeyManagement::WPAPSK; wifi_security.authentication_algorithm = String::from("none"); @@ -371,7 +371,7 @@ fn setup_callbacks(wifi_options: &Arc, path: Path<'static>) { .connect_changed(clone!(@weak imp => move |entry| { let password_input = entry.text(); let mut conn = imp.connection.borrow_mut(); - if let TypeSettings::WIFI(wifi, wifi_security) = &mut conn.device { + if let TypeSettings::WIFI(_, wifi_security) = &mut conn.device { wifi_security.psk = password_input.to_string(); } })); @@ -385,11 +385,10 @@ fn set_connection_settings(path: Path<'static>, prop: HashMap) "/org/Xetibo/ReSetDaemon", Duration::from_millis(1000), ); - let asdf: Result<(bool,), Error> = proxy.method_call( + let _: Result<(bool,), Error> = proxy.method_call( "org.Xetibo.ReSetWireless", "SetConnectionSettings", (path, prop), ); - dbg!(asdf); }); }