diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index 9b6a547..4e15a3b 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -246,7 +246,7 @@ impl cosmic::Application for SettingsApp { Some(&self.nav_model) } - fn header_start(&self) -> Vec> { + fn header_start(&self) -> Vec> { let mut widgets = Vec::new(); widgets.push(if self.search_active { @@ -798,7 +798,7 @@ impl cosmic::Application for SettingsApp { .unwrap_or_else(Task::none) } - fn view(&self) -> Element { + fn view(&self) -> Element<'_, Message> { let view = if self.search_active && !self.search_input.is_empty() { self.search_view() } else if let Some(content) = self.pages.content(self.active_page) { @@ -813,11 +813,11 @@ impl cosmic::Application for SettingsApp { } #[allow(clippy::too_many_lines)] - fn view_window(&self, id: window::Id) -> Element { + fn view_window(&self, id: window::Id) -> Element<'_, Message> { panic!("unknown window ID: {id:?}"); } - fn context_drawer(&self) -> Option> { + fn context_drawer(&self) -> Option> { if self.core.window.show_context { self.active_context_page.and_then(|context_page| { self.pages.context_drawer(context_page).map(|cd| { @@ -836,7 +836,7 @@ impl cosmic::Application for SettingsApp { } } - fn dialog(&self) -> Option> { + fn dialog(&self) -> Option> { self.pages .dialog(self.active_page) .map(|e| e.map(Message::PageMessage)) @@ -939,7 +939,7 @@ impl SettingsApp { /// Adds a main page to the settings application. fn insert_page>( &mut self, - ) -> page::Insert { + ) -> page::Insert<'_, crate::pages::Message> { let id = self.pages.register::

().id(); self.navbar_insert(id); @@ -949,7 +949,7 @@ impl SettingsApp { } } - fn navbar_insert(&mut self, id: page::Entity) -> segmented_button::SingleSelectEntityMut { + fn navbar_insert(&mut self, id: page::Entity) -> segmented_button::SingleSelectEntityMut<'_> { let page = &self.pages.info[id]; self.nav_model @@ -961,7 +961,7 @@ impl SettingsApp { } /// Displays the view of a page. - fn page_view(&self, content: &[section::Entity]) -> cosmic::Element { + fn page_view(&self, content: &[section::Entity]) -> cosmic::Element<'_, Message> { let page = &self.pages.page[self.active_page]; let page_info = &self.pages.info[self.active_page]; let mut sections_column = Vec::with_capacity(content.len()); @@ -1092,7 +1092,7 @@ impl SettingsApp { } /// Displays the search view. - fn search_view(&self) -> cosmic::Element { + fn search_view(&self) -> cosmic::Element<'_, Message> { let mut sections: Vec> = Vec::new(); let mut current_page = page::Entity::default(); @@ -1125,7 +1125,7 @@ impl SettingsApp { } /// Displays the sub-pages view of a page. - fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element { + fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element<'_, Message> { let page_list = sub_pages .iter() .copied() diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs index 67eaea8..0308a1f 100644 --- a/cosmic-settings/src/pages/applications/startup_apps.rs +++ b/cosmic-settings/src/pages/applications/startup_apps.rs @@ -110,7 +110,7 @@ impl page::Page for Page { Some(vec![sections.insert(apps())]) } - fn context_drawer(&self) -> Option> { + fn context_drawer(&self) -> Option> { match &self.context { Some(Context::AddApplication(directory_type)) => { let search = widget::search_input(fl!("type-to-search"), &self.application_search) diff --git a/cosmic-settings/src/pages/desktop/dock/applets.rs b/cosmic-settings/src/pages/desktop/dock/applets.rs index 1affb47..5dc1923 100644 --- a/cosmic-settings/src/pages/desktop/dock/applets.rs +++ b/cosmic-settings/src/pages/desktop/dock/applets.rs @@ -99,7 +99,7 @@ impl page::Page for Page { Some(content) } - fn context_drawer(&self) -> Option> { + fn context_drawer(&self) -> Option> { Some(cosmic::app::context_drawer( match self.inner.context { Some(ContextDrawerVariant::AddApplet) => self diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs index 805b93a..06cd20f 100644 --- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs @@ -32,7 +32,7 @@ use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock}; use crate::{app, pages}; use cosmic_panel_config::CosmicPanelConfig; use cosmic_settings_page::{self as page, Section, section}; -use freedesktop_desktop_entry::{DesktopEntry, unicase::UniCase}; +use freedesktop_desktop_entry::DesktopEntry; use slotmap::{Key, SlotMap}; use tracing::error; @@ -131,7 +131,7 @@ impl page::Page for Page { Some(content) } - fn context_drawer(&self) -> Option> { + fn context_drawer(&self) -> Option> { Some(match self.context { Some(ContextDrawerVariant::AddApplet) => { let search_input = text_input::search_input(fl!("search-applets"), &self.search) @@ -230,7 +230,7 @@ impl Page { pub fn add_applet_view crate::pages::Message + Copy + 'static>( &self, msg_map: T, - ) -> Element { + ) -> Element<'_, crate::pages::Message> { let cosmic::cosmic_theme::Spacing { space_xxxs, space_xs, diff --git a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs index 9044908..e3e92e0 100644 --- a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs +++ b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs @@ -675,7 +675,7 @@ impl Page { } #[must_use] - pub fn display_image_view(&self) -> cosmic::Element { + pub fn display_image_view(&self) -> cosmic::Element<'_, Message> { match self.cached_display_handle { Some(ref handle) => cosmic::widget::image(handle.clone()) .width(Length::Fixed(SIMULATED_WIDTH as f32)) diff --git a/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs b/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs index 1068098..f1e5e08 100644 --- a/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs +++ b/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs @@ -130,7 +130,7 @@ pub fn wallpaper_select_options( page: &super::Page, selected: Option, show_custom_images: bool, -) -> Element { +) -> Element<'_, Message> { let mut vec = Vec::with_capacity(page.selection.selection_handles.len()); if show_custom_images { @@ -159,7 +159,7 @@ pub fn wallpaper_select_options( flex_select_row(vec) } -fn flex_select_row(elements: Vec>) -> Element { +fn flex_select_row(elements: Vec>) -> Element<'_, Message> { cosmic::widget::flex_row(elements) .column_spacing(COLUMN_SPACING) .row_spacing(ROW_SPACING) @@ -173,7 +173,7 @@ fn wallpaper_button( id: DefaultKey, removable: bool, selected: bool, -) -> Element { +) -> Element<'_, Message> { cosmic::widget::button::image(handle.clone()) .selected(selected) .on_press(Message::Select(id)) diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index c8b19c1..f0cc336 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -451,7 +451,7 @@ impl page::Page for Page { /// the Randr enum value which undos the current change. Makde sure the /// return value is returned with the `exec_value` return value within a batch /// Task. - fn dialog(&self) -> Option> { + fn dialog(&self) -> Option> { self.dialog?; let element = widget::dialog() .title(fl!("dialog", "title")) diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index d767206..8f22cd5 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -249,7 +249,7 @@ fn input_source( id: DefaultKey, description: &str, expanded_source_popover: Option, -) -> cosmic::Element { +) -> cosmic::Element<'_, Message> { let expanded = expanded_source_popover.is_some_and(|expanded_id| expanded_id == id); settings::item(description, popover_button(id, expanded)).into() diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs index 59af9ff..fc5a054 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs @@ -676,7 +676,7 @@ impl Model { } } - pub(super) fn view(&self) -> Element { + pub(super) fn view(&self) -> Element<'_, ShortcutMessage> { self.shortcut_models .iter() .map(|(id, shortcut)| shortcut_item(self.custom, id, shortcut)) @@ -855,7 +855,7 @@ fn context_drawer<'a>( } /// Display a shortcut as a list item -fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element { +fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, ShortcutMessage> { #[derive(Copy, Clone, Debug)] enum LocalMessage { Remove, diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index f62a47a..8e913a8 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -475,7 +475,7 @@ fn shortcuts() -> Section { } /// Display a category as a list item -fn category_item(category: Category, name: &str, modified: u16) -> Element { +fn category_item(category: Category, name: &str, modified: u16) -> Element<'_, Message> { let icon = icon::from_name("go-next-symbolic").size(16); let control = if modified == 0 { diff --git a/cosmic-settings/src/pages/system/users/mod.rs b/cosmic-settings/src/pages/system/users/mod.rs index 6bab7a1..049be48 100644 --- a/cosmic-settings/src/pages/system/users/mod.rs +++ b/cosmic-settings/src/pages/system/users/mod.rs @@ -142,7 +142,7 @@ impl page::Page for Page { .description(fl!("users", "desc")) } - fn dialog(&self) -> Option> { + fn dialog(&self) -> Option> { let dialog = self.dialog.as_ref()?; let dialog_element = match dialog { diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 26ff362..2daab6e 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -173,7 +173,7 @@ impl page::Page for Page { .map(crate::pages::Message::DateAndTime) } - fn context_drawer(&self) -> Option> { + fn context_drawer(&self) -> Option> { if self.timezone_context { let search = widget::search_input(fl!("type-to-search"), &self.timezone_search) .on_input(Message::TimezoneSearch) diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs index 1afddbb..a9362e4 100644 --- a/cosmic-settings/src/widget/mod.rs +++ b/cosmic-settings/src/widget/mod.rs @@ -52,7 +52,7 @@ pub fn color_picker_context_view<'a, Message: Clone + 'static>( pub fn search_header( pages: &page::Binder, page: page::Entity, -) -> cosmic::Element { +) -> cosmic::Element<'_, crate::Message> { let page_meta = &pages.info[page]; let mut column_children = Vec::with_capacity(4); @@ -80,12 +80,12 @@ pub fn search_header( column::with_children(column_children).into() } -pub fn search_page_link(title: &str) -> button::TextButton { +pub fn search_page_link(title: &str) -> button::TextButton<'_, Message> { button::text(title).class(button::ButtonClass::Link) } #[must_use] -pub fn page_title(page: &page::Info) -> Element { +pub fn page_title(page: &page::Info) -> Element<'_, Message> { row::with_capacity(2) .push(text::title3(page.title.as_str())) .push(horizontal_space()) diff --git a/page/src/binder.rs b/page/src/binder.rs index 834dd87..b9aee2b 100644 --- a/page/src/binder.rs +++ b/page/src/binder.rs @@ -97,7 +97,7 @@ impl Binder { } /// Registers a new page in the settings panel. - pub fn register>(&mut self) -> crate::Insert { + pub fn register>(&mut self) -> crate::Insert<'_, Message> { let page = P::default(); let id = self.register_page(page);