From 039aeb1e74ae7a8596e53b7d92d7611430222533 Mon Sep 17 00:00:00 2001 From: Ron Waldon-Howe Date: Fri, 12 Jan 2024 16:49:05 +1100 Subject: [PATCH] chore: rust-toolchain.toml; `cargo clippy --fix` --- app/src/pages/desktop/appearance.rs | 2 +- app/src/pages/desktop/dock/applets.rs | 2 +- app/src/pages/desktop/panel/applets_inner.rs | 4 ++-- app/src/pages/desktop/wallpaper/widgets.rs | 2 +- app/src/pages/desktop/workspaces.rs | 6 +++--- app/src/pages/input/keyboard/mod.rs | 4 ++-- rust-toolchain | 1 - rust-toolchain.toml | 3 +++ 8 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/app/src/pages/desktop/appearance.rs b/app/src/pages/desktop/appearance.rs index cac9604..324a60e 100644 --- a/app/src/pages/desktop/appearance.rs +++ b/app/src/pages/desktop/appearance.rs @@ -31,7 +31,7 @@ use crate::app; use super::wallpaper::widgets::color_image; -pub static COLOR_PICKER_DIALOG_ID: Lazy = Lazy::new(|| window::Id::unique()); +pub static COLOR_PICKER_DIALOG_ID: Lazy = Lazy::new(window::Id::unique); enum NamedColorPicker { CustomAccent, diff --git a/app/src/pages/desktop/dock/applets.rs b/app/src/pages/desktop/dock/applets.rs index 6c24b7a..44945bd 100644 --- a/app/src/pages/desktop/dock/applets.rs +++ b/app/src/pages/desktop/dock/applets.rs @@ -13,7 +13,7 @@ use crate::{ }, }; -pub static ADD_DOCK_APPLET_DIALOGUE_ID: Lazy = Lazy::new(|| window::Id::unique()); +pub static ADD_DOCK_APPLET_DIALOGUE_ID: Lazy = Lazy::new(window::Id::unique); pub(crate) struct Page { inner: applets_inner::Page, diff --git a/app/src/pages/desktop/panel/applets_inner.rs b/app/src/pages/desktop/panel/applets_inner.rs index 4d23c69..3bd28e4 100644 --- a/app/src/pages/desktop/panel/applets_inner.rs +++ b/app/src/pages/desktop/panel/applets_inner.rs @@ -68,8 +68,8 @@ const SPACING: f32 = 8.0; // radius is 8.0 const DRAG_START_DISTANCE_SQUARED: f32 = 64.0; -pub static APPLET_DND_ICON_ID: Lazy = Lazy::new(|| window::Id::unique()); -pub static ADD_PANEL_APPLET_DIALOGUE_ID: Lazy = Lazy::new(|| window::Id::unique()); +pub static APPLET_DND_ICON_ID: Lazy = Lazy::new(window::Id::unique); +pub static ADD_PANEL_APPLET_DIALOGUE_ID: Lazy = Lazy::new(window::Id::unique); pub struct Page { pub(crate) available_entries: Vec>, diff --git a/app/src/pages/desktop/wallpaper/widgets.rs b/app/src/pages/desktop/wallpaper/widgets.rs index 88ac417..6e8e43d 100644 --- a/app/src/pages/desktop/wallpaper/widgets.rs +++ b/app/src/pages/desktop/wallpaper/widgets.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only use super::Message; -use cosmic::iced_core::{self, gradient::Linear, Background, BorderRadius, Color, Degrees, Length}; +use cosmic::iced_core::{self, gradient::Linear, Background, Color, Degrees, Length}; use cosmic::iced_runtime::core::image::Handle as ImageHandle; use cosmic::prelude::*; use cosmic::widget::{button, container, space}; diff --git a/app/src/pages/desktop/workspaces.rs b/app/src/pages/desktop/workspaces.rs index 9d19f95..22182d2 100644 --- a/app/src/pages/desktop/workspaces.rs +++ b/app/src/pages/desktop/workspaces.rs @@ -193,14 +193,14 @@ fn multi_behavior() -> Section { &descriptions[0], WorkspaceMode::Global, Some(page.comp_workspace_config.workspace_mode), - |x| Message::SetWorkspaceMode(x), + Message::SetWorkspaceMode, ) .into()])) .add(settings::item_row(vec![radio( &descriptions[1], WorkspaceMode::OutputBound, Some(page.comp_workspace_config.workspace_mode), - |x| Message::SetWorkspaceMode(x), + Message::SetWorkspaceMode, ) .into()])) .apply(Element::from) @@ -239,7 +239,7 @@ fn workspace_orientation() -> Section { settings::view_section(§ion.title) .add( cosmic::widget::segmented_selection::horizontal(&page.orientation_model) - .on_activate(|x| Message::OrientationButtonSelected(x)), + .on_activate(Message::OrientationButtonSelected), ) .apply(Element::from) .map(crate::pages::Message::DesktopWorkspaces) diff --git a/app/src/pages/input/keyboard/mod.rs b/app/src/pages/input/keyboard/mod.rs index 758b091..e3e5178 100644 --- a/app/src/pages/input/keyboard/mod.rs +++ b/app/src/pages/input/keyboard/mod.rs @@ -14,8 +14,8 @@ use slotmap::SlotMap; use super::Message; -pub static ADD_INPUT_SOURCE_DIALOGUE_ID: Lazy = Lazy::new(|| window::Id::unique()); -pub static SPECIAL_CHARACTER_DIALOGUE_ID: Lazy = Lazy::new(|| window::Id::unique()); +pub static ADD_INPUT_SOURCE_DIALOGUE_ID: Lazy = Lazy::new(window::Id::unique); +pub static SPECIAL_CHARACTER_DIALOGUE_ID: Lazy = Lazy::new(window::Id::unique); static COMPOSE_OPTIONS: &[(&str, &str)] = &[ // ("Left Alt", "compose:lalt"), XXX? diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 9006c0b..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.70.0 \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..5299106 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.70.0" +components = ["clippy", "rustfmt"]