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

chore: apply recommendations from clippy

Browse source
This commit is contained in:
Cheong Lau 2025-10-04 10:51:18 +10:00 • committed by GitHub
parent cec55dafd7
commit 8e0f1c4a09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
56 changed files with 720 additions and 824 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cosmic-applet-power/src/lib.rs
View file

@ -99,7 +99,7 @@ impl cosmic::Application for Power {
core,
icon_name: "system-shutdown-symbolic".to_string(),
subsurface_id: window::Id::unique(),
popup: Default::default(),
popup: Option::default(),
},
Task::none(),
)
@ -158,12 +158,12 @@ impl cosmic::Application for Power {
}
}
a => return a.perform(),
};
}
Task::none()
}
Message::Zbus(result) => {
if let Err(e) = result {
eprintln!("cosmic-applet-power ERROR: '{}'", e);
eprintln!("cosmic-applet-power ERROR: '{e}'");
}
Task::none()
}
@ -181,7 +181,7 @@ impl cosmic::Application for Power {
}
}
fn view(&self) -> Element<Message> {
fn view(&self) -> Element<'_, Message> {
self.core
.applet
.icon_button(&self.icon_name)
@ -189,7 +189,7 @@ impl cosmic::Application for Power {
.into()
}
fn view_window(&self, id: window::Id) -> Element<Message> {
fn view_window(&self, id: window::Id) -> Element<'_, Message> {
let Spacing {
space_xxs,
space_s,
@ -264,7 +264,7 @@ impl cosmic::Application for Power {
}
}
fn power_buttons(name: &str, on_press: Message) -> button::Button<Message> {
fn power_buttons(name: &str, on_press: Message) -> button::Button<'_, Message> {
button::custom(
widget::container(text_icon(name, 40))
.width(Length::Fill)
@ -340,16 +340,13 @@ async fn lock() -> zbus::Result<()> {
async fn log_out() -> zbus::Result<()> {
let session_type = std::env::var("XDG_CURRENT_DESKTOP").ok();
let connection = Connection::session().await?;
match session_type.as_ref().map(|s| s.trim()) {
Some("pop:GNOME") => {
let manager_proxy = SessionManagerProxy::new(&connection).await?;
manager_proxy.logout(0).await?;
}
if let Some("pop:GNOME") = session_type.as_ref().map(|s| s.trim()) {
let manager_proxy = SessionManagerProxy::new(&connection).await?;
manager_proxy.logout(0).await?;
} else {
// By default assume COSMIC
_ => {
let cosmic_session = CosmicSessionProxy::new(&connection).await?;
cosmic_session.exit().await?;
}
let cosmic_session = CosmicSessionProxy::new(&connection).await?;
cosmic_session.exit().await?;
}
Ok(())
}

2
cosmic-applet-power/src/localize.rs
View file

@ -43,6 +43,6 @@ pub fn localize() {
let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
if let Err(error) = localizer.select(&requested_languages) {
eprintln!("Error while loading language for App List {}", error);
eprintln!("Error while loading language for App List {error}");
}
}