From 66794186960941c2ea6e741c8ebf95e59c895778 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Fri, 6 Sep 2019 22:48:50 +0200 Subject: [PATCH] rustfmt --- src/config.rs | 149 +++++++++++++++++++++------------------- src/main.rs | 8 +-- src/widgets/launcher.rs | 9 ++- 3 files changed, 90 insertions(+), 76 deletions(-) diff --git a/src/config.rs b/src/config.rs index fce4b08..1da7020 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,15 +1,15 @@ use crate::cmd::Cmd; use crate::widget; use crate::widgets; -use std::sync::mpsc::Sender; use serde::{Deserialize, Serialize}; use std::default::Default; +use std::sync::mpsc::Sender; #[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "camelCase")] pub enum Widget { Margin { - margins: (u32, u32, u32, u32), + margins: (u32, u32, u32, u32), widget: Box, }, Fixed { @@ -32,11 +32,11 @@ pub enum Widget { Launcher { font_size: f32, length: u32, - #[serde(default)] + #[serde(default)] app_opener: String, - #[serde(default)] + #[serde(default)] term_opener: String, - #[serde(default)] + #[serde(default)] url_opener: String, }, Battery { @@ -56,10 +56,7 @@ pub enum Widget { impl Widget { pub fn construct(self, tx: Sender) -> Option> { match self { - Widget::Margin { - margins, - widget, - } => match widget.construct(tx.clone()) { + Widget::Margin { margins, widget } => match widget.construct(tx.clone()) { Some(w) => Some(widget::Margin::new(margins, w)), None => None, }, @@ -93,13 +90,23 @@ impl Widget { font_size, sections, } => Some(widgets::calendar::Calendar::new(font_size, sections)), - Widget::Launcher { font_size, length, app_opener, term_opener, url_opener } => Some(widgets::launcher::Launcher::new( + Widget::Launcher { + font_size, + length, + app_opener, + term_opener, + url_opener, + } => Some(widgets::launcher::Launcher::new( font_size, length, tx.clone(), app_opener, term_opener, - if url_opener.len() == 0 { "xdg_open ".to_string() } else { url_opener }, + if url_opener.len() == 0 { + "xdg_open ".to_string() + } else { + url_opener + }, )), Widget::Battery { font_size, length } => { match widgets::battery::UpowerBattery::new(font_size, length, tx.clone()) { @@ -126,14 +133,14 @@ impl Widget { #[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "camelCase")] pub enum OutputMode { - All, - Active, + All, + Active, } impl Default for OutputMode { - fn default() -> Self { - OutputMode::Active - } + fn default() -> Self { + OutputMode::Active + } } #[derive(Serialize, Deserialize, Debug)] @@ -145,58 +152,58 @@ pub struct Config { } impl Default for Config { - fn default() -> Self { - Config{ - widget: Widget::Margin { - margins: (20, 20, 20, 20), - widget: Box::new(Widget::VerticalLayout(vec![ - Box::new(Widget::HorizontalLayout(vec![ - Box::new(Widget::Margin { - margins: (0, 88, 0, 32), - widget: Box::new(Widget::VerticalLayout(vec![ - Box::new(Widget::Date { font_size: 64.0 }), - Box::new(Widget::Clock { font_size: 256.0 }), - ])), - }), - Box::new(Widget::VerticalLayout(vec![ - Box::new(Widget::Margin { - margins: (0, 0, 0, 8), - widget: Box::new(Widget::Battery { - font_size: 24.0, - length: 600, - }), - }), - Box::new(Widget::Margin { - margins: (0, 0, 0, 8), - widget: Box::new(Widget::Backlight { - font_size: 24.0, - length: 600, - }), - }), - Box::new(Widget::Margin { - margins: (0, 0, 0, 8), - widget: Box::new(Widget::PulseAudio { - font_size: 24.0, - length: 600, - }), - }), - ])), - ])), - Box::new(Widget::Calendar { - font_size: 16.0, - sections: 3, - }), - Box::new(Widget::Launcher { - font_size: 32.0, - length: 1200, - app_opener: "".to_string(), - term_opener: "".to_string(), - url_opener: "".to_string(), - }), - ])), - }, - output_mode: Default::default(), - scale: 1, - } - } -} \ No newline at end of file + fn default() -> Self { + Config { + widget: Widget::Margin { + margins: (20, 20, 20, 20), + widget: Box::new(Widget::VerticalLayout(vec![ + Box::new(Widget::HorizontalLayout(vec![ + Box::new(Widget::Margin { + margins: (0, 88, 0, 32), + widget: Box::new(Widget::VerticalLayout(vec![ + Box::new(Widget::Date { font_size: 64.0 }), + Box::new(Widget::Clock { font_size: 256.0 }), + ])), + }), + Box::new(Widget::VerticalLayout(vec![ + Box::new(Widget::Margin { + margins: (0, 0, 0, 8), + widget: Box::new(Widget::Battery { + font_size: 24.0, + length: 600, + }), + }), + Box::new(Widget::Margin { + margins: (0, 0, 0, 8), + widget: Box::new(Widget::Backlight { + font_size: 24.0, + length: 600, + }), + }), + Box::new(Widget::Margin { + margins: (0, 0, 0, 8), + widget: Box::new(Widget::PulseAudio { + font_size: 24.0, + length: 600, + }), + }), + ])), + ])), + Box::new(Widget::Calendar { + font_size: 16.0, + sections: 3, + }), + Box::new(Widget::Launcher { + font_size: 32.0, + length: 1200, + app_opener: "".to_string(), + term_opener: "".to_string(), + url_opener: "".to_string(), + }), + ])), + }, + output_mode: Default::default(), + scale: 1, + } + } +} diff --git a/src/main.rs b/src/main.rs index af6bbfe..389e0ed 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,10 @@ +use std::default::Default; use std::env; +use std::fs::File; use std::io::{BufRead, BufReader, Read, Write}; use std::os::unix::io::AsRawFd; use std::os::unix::net::{UnixListener, UnixStream}; use std::sync::mpsc::channel; -use std::fs::File; -use std::default::Default; use nix::poll::{poll, PollFd, PollFlags}; use os_pipe::pipe; @@ -40,14 +40,14 @@ fn main() { Err(_) => match env::var("HOME") { Ok(home) => home + "/.config/wldash", Err(_) => panic!("unable to find user folder"), - } + }, }; let config: config::Config = match File::open(config_home + "/config.json") { Ok(f) => { let reader = BufReader::new(f); serde_json::from_reader(reader).unwrap() - }, + } Err(_) => Default::default(), }; diff --git a/src/widgets/launcher.rs b/src/widgets/launcher.rs index e6cfe12..65bfc58 100644 --- a/src/widgets/launcher.rs +++ b/src/widgets/launcher.rs @@ -30,7 +30,14 @@ pub struct Launcher { } impl Launcher { - pub fn new(font_size: f32, length: u32, listener: Sender, app: String, term: String, url: String) -> Box { + pub fn new( + font_size: f32, + length: u32, + listener: Sender, + app: String, + term: String, + url: String, + ) -> Box { Box::new(Launcher { options: load_desktop_files(), term_opener: term,