chore: update to Rust 2024 edition

This commit is contained in:
Vukašin Vojinović 2025-08-12 21:38:51 +02:00 committed by Michael Murphy
parent c3fafd3910
commit 2b7b4cba56
71 changed files with 254 additions and 292 deletions

View file

@ -2,22 +2,19 @@
// SPDX-License-Identifier: GPL-3.0-only
use cosmic::{
app,
Element, Task, app,
applet::cosmic_panel_config::PanelAnchor,
applet::token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate},
applet::token::subscription::{TokenRequest, TokenUpdate, activation_token_subscription},
cctk::sctk::reexports::calloop,
iced::{
self,
overlay::menu,
self, Subscription,
platform_specific::shell::commands::popup::{destroy_popup, get_popup},
window, Limits, Padding, Subscription,
window,
},
surface,
widget::{container, mouse_area},
Element, Task,
};
use std::collections::BTreeMap;
use zbus::connection::socket::channel;
use crate::{components::status_menu, subscriptions::status_notifier_watcher};

View file

@ -2,14 +2,11 @@
// SPDX-License-Identifier: GPL-3.0-only
use cosmic::{
applet::{
menu_button,
token::{self, subscription::TokenRequest},
},
Application,
applet::{menu_button, token::subscription::TokenRequest},
cctk::sctk::reexports::calloop,
iced,
widget::icon,
Application,
};
use crate::subscriptions::status_notifier_item::{IconUpdate, Layout, StatusNotifierItem};
@ -75,7 +72,7 @@ impl State {
.map(|mut i| {
if i.width <= 0 || i.height <= 0 || i.bytes.is_empty() {
// App sent invalid icon data during initialization - show placeholder until NewIcon signal
eprintln!("Skipping invalid icon: {}x{} with {} bytes, app may still be initializing",
eprintln!("Skipping invalid icon: {}x{} with {} bytes, app may still be initializing",
i.width, i.height, i.bytes.len());
return icon::from_name("dialog-question").symbolic(true).handle();
}

View file

@ -1,10 +1,7 @@
// Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: GPL-3.0-only
use cosmic::{
iced::{self, Subscription},
widget::icon,
};
use cosmic::iced::{self, Subscription};
use futures::{FutureExt, StreamExt};
use std::collections::HashMap;
use zbus::zvariant::{self, OwnedValue};
@ -255,7 +252,7 @@ pub trait DBusMenu {
) -> zbus::Result<(u32, Layout)>;
fn event(&self, id: i32, event_id: &str, data: &OwnedValue, timestamp: u32)
-> zbus::Result<()>;
-> zbus::Result<()>;
fn about_to_show(&self, id: i32) -> zbus::Result<bool>;

View file

@ -4,7 +4,7 @@
// TODO: Both this and server proxy could emit same events, have way to generate stream from either?
use cosmic::iced::{self, Subscription};
use futures::{stream, StreamExt};
use futures::{StreamExt, stream};
use crate::subscriptions::status_notifier_item::StatusNotifierItem;

View file

@ -7,11 +7,11 @@
use futures::prelude::*;
use zbus::{
Result,
fdo::{DBusProxy, RequestNameFlags, RequestNameReply},
message::Header,
names::{BusName, UniqueName, WellKnownName},
object_server::SignalEmitter,
Result,
};
const NAME: WellKnownName =
@ -65,7 +65,7 @@ impl StatusNotifierWatcher {
#[zbus(signal)]
async fn status_notifier_item_registered(ctxt: &SignalEmitter<'_>, service: &str)
-> Result<()>;
-> Result<()>;
#[zbus(signal)]
async fn status_notifier_item_unregistered(