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

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

14
cosmic-applet-audio/src/mpris_subscription.rs
View file

@ -35,7 +35,7 @@ pub struct PlayerStatus {
impl PlayerStatus {
async fn new(player: Player) -> Option<Self> {
let metadata = player.metadata().await.ok()?;
let pathname = metadata.url().unwrap_or("".into());
let pathname = metadata.url().unwrap_or_default();
let pathbuf = PathBuf::from(pathname);
let title = metadata
@ -108,7 +108,7 @@ impl MprisPlayer {
})
}
fn name(&self) -> &BusName {
fn name(&self) -> &BusName<'_> {
self.player.inner().destination()
}
}
@ -171,7 +171,7 @@ impl State {
filter_firefox_players(&mut players);
// pre-sort by path so that the same player is always selected
players.sort_by(|a, b| a.name().cmp(&b.name()));
players.sort_by(|a, b| a.name().cmp(b.name()));
let mut state = Self {
conn,
@ -196,7 +196,7 @@ impl State {
};
self.players.push(player);
filter_firefox_players(&mut self.players);
self.players.sort_by(|a, b| a.name().cmp(&b.name()));
self.players.sort_by(|a, b| a.name().cmp(b.name()));
self.update_any_player_state_stream().await;
}
@ -254,7 +254,7 @@ async fn run(output: &mut futures::channel::mpsc::Sender<MprisUpdate>) {
_ = output.send(MprisUpdate::Player(player_status)).await;
} else {
tracing::error!("Failed to get player status.");
};
}
} else {
let _ = output.send(MprisUpdate::Setup).await;
}
@ -287,7 +287,7 @@ async fn run(output: &mut futures::channel::mpsc::Sender<MprisUpdate>) {
}
}
async fn find_active<'a>(players: &'a Vec<MprisPlayer>) -> Option<&'a MprisPlayer> {
async fn find_active<'a>(players: &'a [MprisPlayer]) -> Option<&'a MprisPlayer> {
let mut best = (0, None::<&'a MprisPlayer>);
let eval = |p: Player| async move {
let v = {
@ -303,7 +303,7 @@ async fn find_active<'a>(players: &'a Vec<MprisPlayer>) -> Option<&'a MprisPlaye
v + p.metadata().await.is_ok() as i32
};
for p in players.iter() {
for p in players {
let v = eval(p.player.clone()).await;
if v > best.0 {
best = (v, Some(p));