zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-02 11:11:04 +02:00
Code Activity

refactor: fix new clippy warnings

Browse source
This commit is contained in:
Jake Stanger 2023-06-29 16:57:47 +01:00
parent 27f920d012
commit cc181a8b6d
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
13 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main.rs
View file

@ -46,7 +46,7 @@ use tokio::runtime::Handle;
use tokio::task::{block_in_place, spawn_blocking};
use crate::error::ExitCode;
use clients::wayland::{self, WaylandClient};
use clients::wayland;
use tracing::{debug, error, info};
use universal_config::ConfigLoader;
@ -59,9 +59,9 @@ async fn main() {
cfg_if! {
if #[cfg(feature = "cli")] {
run_with_args().await
run_with_args().await;
} else {
start_ironbar().await
start_ironbar().await;
}
}
}
@ -78,16 +78,14 @@ async fn run_with_args() {
Err(err) => error!("{err:?}"),
};
}
None => start_ironbar().await,
None => start_ironbar(),
}
}
async fn start_ironbar() {
fn start_ironbar() {
info!("Ironbar version {}", VERSION);
info!("Starting application");
let wayland_client = wayland::get_client().await;
let app = Application::builder().application_id(GTK_APP_ID).build();
let running = Rc::new(Cell::new(false));
@ -141,7 +139,7 @@ async fn start_ironbar() {
}
}
if let Err(err) = create_bars(app, &display, wayland_client, &config) {
if let Err(err) = create_bars(app, &display, &config) {
error!("{:?}", err);
exit(ExitCode::CreateBars as i32);
}
@ -189,13 +187,9 @@ async fn start_ironbar() {
}
/// Creates each of the bars across each of the (configured) outputs.
fn create_bars(
app: &Application,
display: &Display,
wl: &WaylandClient,
config: &Config,
) -> Result<()> {
let outputs = wl.get_outputs();
fn create_bars(app: &Application, display: &Display, config: &Config) -> Result<()> {
let wl = wayland::get_client();
let outputs = lock!(wl).get_outputs();
debug!("Received {} outputs from Wayland", outputs.len());
debug!("Outputs: {:?}", outputs);