leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix compiler warnings

Browse source
This commit is contained in:
Ian Douglas Scott 2025-10-28 05:19:16 -07:00 • committed by GitHub
parent 3c3aa72dc8
commit ffdd122bf8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cosmic-settings/src/app.rs
View file

@ -246,7 +246,7 @@ impl cosmic::Application for SettingsApp {
Some(&self.nav_model)
}
fn header_start(&self) -> Vec<Element<Self::Message>> {
fn header_start(&self) -> Vec<Element<'_, Self::Message>> {
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<Message> {
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<Message> {
fn view_window(&self, id: window::Id) -> Element<'_, Message> {
panic!("unknown window ID: {id:?}");
}
fn context_drawer(&self) -> Option<ContextDrawer<Message>> {
fn context_drawer(&self) -> Option<ContextDrawer<'_, Message>> {
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<Element<Self::Message>> {
fn dialog(&self) -> Option<Element<'_, Self::Message>> {
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<P: page::AutoBind<crate::pages::Message>>(
&mut self,
) -> page::Insert<crate::pages::Message> {
) -> page::Insert<'_, crate::pages::Message> {
let id = self.pages.register::<P>().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<Message> {
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<Message> {
fn search_view(&self) -> cosmic::Element<'_, Message> {
let mut sections: Vec<cosmic::Element<Message>> = 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<Message> {
fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element<'_, Message> {
let page_list = sub_pages
.iter()
.copied()

2
cosmic-settings/src/pages/applications/startup_apps.rs
View file

@ -110,7 +110,7 @@ impl page::Page<crate::pages::Message> for Page {
Some(vec![sections.insert(apps())])
}
fn context_drawer(&self) -> Option<ContextDrawer<crate::pages::Message>> {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
match &self.context {
Some(Context::AddApplication(directory_type)) => {
let search = widget::search_input(fl!("type-to-search"), &self.application_search)

2
cosmic-settings/src/pages/desktop/dock/applets.rs
View file

@ -99,7 +99,7 @@ impl page::Page<crate::pages::Message> for Page {
Some(content)
}
fn context_drawer(&self) -> Option<ContextDrawer<crate::pages::Message>> {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
Some(cosmic::app::context_drawer(
match self.inner.context {
Some(ContextDrawerVariant::AddApplet) => self

6
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -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<crate::pages::Message> for Page {
Some(content)
}
fn context_drawer(&self) -> Option<ContextDrawer<pages::Message>> {
fn context_drawer(&self) -> Option<ContextDrawer<'_, pages::Message>> {
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<T: Fn(Message) -> crate::pages::Message + Copy + 'static>(
&self,
msg_map: T,
) -> Element<crate::pages::Message> {
) -> Element<'_, crate::pages::Message> {
let cosmic::cosmic_theme::Spacing {
space_xxxs,
space_xs,

2
cosmic-settings/src/pages/desktop/wallpaper/mod.rs
View file

@ -675,7 +675,7 @@ impl Page {
}
#[must_use]
pub fn display_image_view(&self) -> cosmic::Element<Message> {
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))

6
cosmic-settings/src/pages/desktop/wallpaper/widgets.rs
View file

@ -130,7 +130,7 @@ pub fn wallpaper_select_options(
page: &super::Page,
selected: Option<DefaultKey>,
show_custom_images: bool,
) -> Element<Message> {
) -> 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<Message>>) -> Element<Message> {
fn flex_select_row(elements: Vec<Element<'_, Message>>) -> 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<Message> {
) -> Element<'_, Message> {
cosmic::widget::button::image(handle.clone())
.selected(selected)
.on_press(Message::Select(id))

2
cosmic-settings/src/pages/display/mod.rs
View file

@ -451,7 +451,7 @@ impl page::Page<crate::pages::Message> 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<Element<pages::Message>> {
fn dialog(&self) -> Option<Element<'_, pages::Message>> {
self.dialog?;
let element = widget::dialog()
.title(fl!("dialog", "title"))

2
cosmic-settings/src/pages/input/keyboard/mod.rs
View file

@ -249,7 +249,7 @@ fn input_source(
id: DefaultKey,
description: &str,
expanded_source_popover: Option<DefaultKey>,
) -> cosmic::Element<Message> {
) -> cosmic::Element<'_, Message> {
let expanded = expanded_source_popover.is_some_and(|expanded_id| expanded_id == id);
settings::item(description, popover_button(id, expanded)).into()

4
cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
View file

@ -676,7 +676,7 @@ impl Model {
}
}
pub(super) fn view(&self) -> Element<ShortcutMessage> {
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<ShortcutMessage> {
fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, ShortcutMessage> {
#[derive(Copy, Clone, Debug)]
enum LocalMessage {
Remove,

2
cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
View file

@ -475,7 +475,7 @@ fn shortcuts() -> Section<crate::pages::Message> {
}
/// Display a category as a list item
fn category_item(category: Category, name: &str, modified: u16) -> Element<Message> {
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 {

2
cosmic-settings/src/pages/system/users/mod.rs
View file

@ -142,7 +142,7 @@ impl page::Page<crate::pages::Message> for Page {
.description(fl!("users", "desc"))
}
fn dialog(&self) -> Option<Element<pages::Message>> {
fn dialog(&self) -> Option<Element<'_, pages::Message>> {
let dialog = self.dialog.as_ref()?;
let dialog_element = match dialog {

2
cosmic-settings/src/pages/time/date.rs
View file

@ -173,7 +173,7 @@ impl page::Page<crate::pages::Message> for Page {
.map(crate::pages::Message::DateAndTime)
}
fn context_drawer(&self) -> Option<ContextDrawer<crate::pages::Message>> {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
if self.timezone_context {
let search = widget::search_input(fl!("type-to-search"), &self.timezone_search)
.on_input(Message::TimezoneSearch)

6
cosmic-settings/src/widget/mod.rs
View file

@ -52,7 +52,7 @@ pub fn color_picker_context_view<'a, Message: Clone + 'static>(
pub fn search_header<Message>(
pages: &page::Binder<Message>,
page: page::Entity,
) -> cosmic::Element<crate::Message> {
) -> 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<Message>(
column::with_children(column_children).into()
}
pub fn search_page_link<Message: 'static>(title: &str) -> button::TextButton<Message> {
pub fn search_page_link<Message: 'static>(title: &str) -> button::TextButton<'_, Message> {
button::text(title).class(button::ButtonClass::Link)
}
#[must_use]
pub fn page_title<Message: 'static>(page: &page::Info) -> Element<Message> {
pub fn page_title<Message: 'static>(page: &page::Info) -> Element<'_, Message> {
row::with_capacity(2)
.push(text::title3(page.title.as_str()))
.push(horizontal_space())