1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-02 03:01:04 +02:00

refactor: standardise error messages

This commit is contained in:
Jake Stanger 2022-12-11 21:31:45 +00:00
parent fd2d7e5c7a
commit 9d5049dde0
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
19 changed files with 117 additions and 110 deletions

View file

@ -1,7 +1,7 @@
use crate::clients::wayland::{self, ToplevelChange};
use crate::config::CommonConfig;
use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
use crate::{await_sync, icon};
use crate::{await_sync, error, icon};
use color_eyre::Result;
use glib::Continue;
use gtk::prelude::*;
@ -49,11 +49,7 @@ impl Module<gtk::Box> for FocusedModule {
) -> Result<()> {
let focused = await_sync(async {
let wl = wayland::get_client().await;
let toplevels = wl
.toplevels
.read()
.expect("Failed to get read lock on toplevels")
.clone();
let toplevels = wl.toplevels.read().expect(error::ERR_READ_LOCK).clone();
toplevels.into_iter().find(|(_, (top, _))| top.active)
});
@ -81,7 +77,7 @@ impl Module<gtk::Box> for FocusedModule {
event.toplevel.app_id,
)))
.await
.expect("Failed to send focus update");
.expect(error::ERR_CHANNEL_SEND);
}
}
});