Skip to content

Commit ffdd122

Browse files
authored
chore: fix compiler warnings
1 parent 3c3aa72 commit ffdd122

File tree

14 files changed

+30
-30
lines changed

14 files changed

+30
-30
lines changed

cosmic-settings/src/app.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl cosmic::Application for SettingsApp {
246246
Some(&self.nav_model)
247247
}
248248

249-
fn header_start(&self) -> Vec<Element<Self::Message>> {
249+
fn header_start(&self) -> Vec<Element<'_, Self::Message>> {
250250
let mut widgets = Vec::new();
251251

252252
widgets.push(if self.search_active {
@@ -798,7 +798,7 @@ impl cosmic::Application for SettingsApp {
798798
.unwrap_or_else(Task::none)
799799
}
800800

801-
fn view(&self) -> Element<Message> {
801+
fn view(&self) -> Element<'_, Message> {
802802
let view = if self.search_active && !self.search_input.is_empty() {
803803
self.search_view()
804804
} else if let Some(content) = self.pages.content(self.active_page) {
@@ -813,11 +813,11 @@ impl cosmic::Application for SettingsApp {
813813
}
814814

815815
#[allow(clippy::too_many_lines)]
816-
fn view_window(&self, id: window::Id) -> Element<Message> {
816+
fn view_window(&self, id: window::Id) -> Element<'_, Message> {
817817
panic!("unknown window ID: {id:?}");
818818
}
819819

820-
fn context_drawer(&self) -> Option<ContextDrawer<Message>> {
820+
fn context_drawer(&self) -> Option<ContextDrawer<'_, Message>> {
821821
if self.core.window.show_context {
822822
self.active_context_page.and_then(|context_page| {
823823
self.pages.context_drawer(context_page).map(|cd| {
@@ -836,7 +836,7 @@ impl cosmic::Application for SettingsApp {
836836
}
837837
}
838838

839-
fn dialog(&self) -> Option<Element<Self::Message>> {
839+
fn dialog(&self) -> Option<Element<'_, Self::Message>> {
840840
self.pages
841841
.dialog(self.active_page)
842842
.map(|e| e.map(Message::PageMessage))
@@ -939,7 +939,7 @@ impl SettingsApp {
939939
/// Adds a main page to the settings application.
940940
fn insert_page<P: page::AutoBind<crate::pages::Message>>(
941941
&mut self,
942-
) -> page::Insert<crate::pages::Message> {
942+
) -> page::Insert<'_, crate::pages::Message> {
943943
let id = self.pages.register::<P>().id();
944944
self.navbar_insert(id);
945945

@@ -949,7 +949,7 @@ impl SettingsApp {
949949
}
950950
}
951951

952-
fn navbar_insert(&mut self, id: page::Entity) -> segmented_button::SingleSelectEntityMut {
952+
fn navbar_insert(&mut self, id: page::Entity) -> segmented_button::SingleSelectEntityMut<'_> {
953953
let page = &self.pages.info[id];
954954

955955
self.nav_model
@@ -961,7 +961,7 @@ impl SettingsApp {
961961
}
962962

963963
/// Displays the view of a page.
964-
fn page_view(&self, content: &[section::Entity]) -> cosmic::Element<Message> {
964+
fn page_view(&self, content: &[section::Entity]) -> cosmic::Element<'_, Message> {
965965
let page = &self.pages.page[self.active_page];
966966
let page_info = &self.pages.info[self.active_page];
967967
let mut sections_column = Vec::with_capacity(content.len());
@@ -1092,7 +1092,7 @@ impl SettingsApp {
10921092
}
10931093

10941094
/// Displays the search view.
1095-
fn search_view(&self) -> cosmic::Element<Message> {
1095+
fn search_view(&self) -> cosmic::Element<'_, Message> {
10961096
let mut sections: Vec<cosmic::Element<Message>> = Vec::new();
10971097

10981098
let mut current_page = page::Entity::default();
@@ -1125,7 +1125,7 @@ impl SettingsApp {
11251125
}
11261126

11271127
/// Displays the sub-pages view of a page.
1128-
fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element<Message> {
1128+
fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element<'_, Message> {
11291129
let page_list = sub_pages
11301130
.iter()
11311131
.copied()

cosmic-settings/src/pages/applications/startup_apps.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl page::Page<crate::pages::Message> for Page {
110110
Some(vec![sections.insert(apps())])
111111
}
112112

113-
fn context_drawer(&self) -> Option<ContextDrawer<crate::pages::Message>> {
113+
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
114114
match &self.context {
115115
Some(Context::AddApplication(directory_type)) => {
116116
let search = widget::search_input(fl!("type-to-search"), &self.application_search)

cosmic-settings/src/pages/desktop/dock/applets.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl page::Page<crate::pages::Message> for Page {
9999
Some(content)
100100
}
101101

102-
fn context_drawer(&self) -> Option<ContextDrawer<crate::pages::Message>> {
102+
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
103103
Some(cosmic::app::context_drawer(
104104
match self.inner.context {
105105
Some(ContextDrawerVariant::AddApplet) => self

cosmic-settings/src/pages/desktop/panel/applets_inner.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock};
3232
use crate::{app, pages};
3333
use cosmic_panel_config::CosmicPanelConfig;
3434
use cosmic_settings_page::{self as page, Section, section};
35-
use freedesktop_desktop_entry::{DesktopEntry, unicase::UniCase};
35+
use freedesktop_desktop_entry::DesktopEntry;
3636
use slotmap::{Key, SlotMap};
3737
use tracing::error;
3838

@@ -131,7 +131,7 @@ impl page::Page<crate::pages::Message> for Page {
131131
Some(content)
132132
}
133133

134-
fn context_drawer(&self) -> Option<ContextDrawer<pages::Message>> {
134+
fn context_drawer(&self) -> Option<ContextDrawer<'_, pages::Message>> {
135135
Some(match self.context {
136136
Some(ContextDrawerVariant::AddApplet) => {
137137
let search_input = text_input::search_input(fl!("search-applets"), &self.search)
@@ -230,7 +230,7 @@ impl Page {
230230
pub fn add_applet_view<T: Fn(Message) -> crate::pages::Message + Copy + 'static>(
231231
&self,
232232
msg_map: T,
233-
) -> Element<crate::pages::Message> {
233+
) -> Element<'_, crate::pages::Message> {
234234
let cosmic::cosmic_theme::Spacing {
235235
space_xxxs,
236236
space_xs,

cosmic-settings/src/pages/desktop/wallpaper/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ impl Page {
675675
}
676676

677677
#[must_use]
678-
pub fn display_image_view(&self) -> cosmic::Element<Message> {
678+
pub fn display_image_view(&self) -> cosmic::Element<'_, Message> {
679679
match self.cached_display_handle {
680680
Some(ref handle) => cosmic::widget::image(handle.clone())
681681
.width(Length::Fixed(SIMULATED_WIDTH as f32))

cosmic-settings/src/pages/desktop/wallpaper/widgets.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub fn wallpaper_select_options(
130130
page: &super::Page,
131131
selected: Option<DefaultKey>,
132132
show_custom_images: bool,
133-
) -> Element<Message> {
133+
) -> Element<'_, Message> {
134134
let mut vec = Vec::with_capacity(page.selection.selection_handles.len());
135135

136136
if show_custom_images {
@@ -159,7 +159,7 @@ pub fn wallpaper_select_options(
159159
flex_select_row(vec)
160160
}
161161

162-
fn flex_select_row(elements: Vec<Element<Message>>) -> Element<Message> {
162+
fn flex_select_row(elements: Vec<Element<'_, Message>>) -> Element<'_, Message> {
163163
cosmic::widget::flex_row(elements)
164164
.column_spacing(COLUMN_SPACING)
165165
.row_spacing(ROW_SPACING)
@@ -173,7 +173,7 @@ fn wallpaper_button(
173173
id: DefaultKey,
174174
removable: bool,
175175
selected: bool,
176-
) -> Element<Message> {
176+
) -> Element<'_, Message> {
177177
cosmic::widget::button::image(handle.clone())
178178
.selected(selected)
179179
.on_press(Message::Select(id))

cosmic-settings/src/pages/display/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ impl page::Page<crate::pages::Message> for Page {
451451
/// the Randr enum value which undos the current change. Makde sure the
452452
/// return value is returned with the `exec_value` return value within a batch
453453
/// Task.
454-
fn dialog(&self) -> Option<Element<pages::Message>> {
454+
fn dialog(&self) -> Option<Element<'_, pages::Message>> {
455455
self.dialog?;
456456
let element = widget::dialog()
457457
.title(fl!("dialog", "title"))

cosmic-settings/src/pages/input/keyboard/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ fn input_source(
249249
id: DefaultKey,
250250
description: &str,
251251
expanded_source_popover: Option<DefaultKey>,
252-
) -> cosmic::Element<Message> {
252+
) -> cosmic::Element<'_, Message> {
253253
let expanded = expanded_source_popover.is_some_and(|expanded_id| expanded_id == id);
254254

255255
settings::item(description, popover_button(id, expanded)).into()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ impl Model {
676676
}
677677
}
678678

679-
pub(super) fn view(&self) -> Element<ShortcutMessage> {
679+
pub(super) fn view(&self) -> Element<'_, ShortcutMessage> {
680680
self.shortcut_models
681681
.iter()
682682
.map(|(id, shortcut)| shortcut_item(self.custom, id, shortcut))
@@ -855,7 +855,7 @@ fn context_drawer<'a>(
855855
}
856856

857857
/// Display a shortcut as a list item
858-
fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<ShortcutMessage> {
858+
fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, ShortcutMessage> {
859859
#[derive(Copy, Clone, Debug)]
860860
enum LocalMessage {
861861
Remove,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ fn shortcuts() -> Section<crate::pages::Message> {
475475
}
476476

477477
/// Display a category as a list item
478-
fn category_item(category: Category, name: &str, modified: u16) -> Element<Message> {
478+
fn category_item(category: Category, name: &str, modified: u16) -> Element<'_, Message> {
479479
let icon = icon::from_name("go-next-symbolic").size(16);
480480

481481
let control = if modified == 0 {

0 commit comments

Comments
 (0)