bl/wldash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

rustfmt

Browse Source
This commit is contained in:
Kenny Levinsen
2019-10-02 16:25:43 +02:00
parent 29252cbbc6
commit c676c0223b
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.rs
+7 -7
View File
@@ -48,16 +48,16 @@ pub enum Widget {
font_size: f32, font_size: f32,
length: u32, length: u32,
}, },
#[cfg(feature="pulseaudio-widget")] #[cfg(feature = "pulseaudio-widget")]
PulseAudio { PulseAudio {
font_size: f32, font_size: f32,
length: u32, length: u32,
}, },
#[cfg(feature="alsa-widget")] #[cfg(feature = "alsa-widget")]
AlsaSound { AlsaSound {
font_size: f32, font_size: f32,
length: u32 length: u32,
} },
} }
impl Widget { impl Widget {
@@ -127,14 +127,14 @@ impl Widget {
Err(_) => None, Err(_) => None,
} }
} }
#[cfg(feature="pulseaudio-widget")] #[cfg(feature = "pulseaudio-widget")]
Widget::PulseAudio { font_size, length } => { Widget::PulseAudio { font_size, length } => {
match widgets::audio::PulseAudio::new(font_size, length, tx.clone()) { match widgets::audio::PulseAudio::new(font_size, length, tx.clone()) {
Ok(w) => Some(w), Ok(w) => Some(w),
Err(_) => None, Err(_) => None,
} }
} }
#[cfg(feature="alsa-widget")] #[cfg(feature = "alsa-widget")]
Widget::AlsaSound { font_size, length } => { Widget::AlsaSound { font_size, length } => {
match widgets::audio::Alsa::new(font_size, length) { match widgets::audio::Alsa::new(font_size, length) {
Ok(w) => Some(w), Ok(w) => Some(w),
@@ -196,7 +196,7 @@ impl Default for Config {
length: 600, length: 600,
}), }),
}), }),
#[cfg(feature="pulseaudio-widget")] #[cfg(feature = "pulseaudio-widget")]
Box::new(Widget::Margin { Box::new(Widget::Margin {
margins: (0, 0, 0, 8), margins: (0, 0, 0, 8),
widget: Box::new(Widget::PulseAudio { widget: Box::new(Widget::PulseAudio {
src/widgets/audio/mod.rs
+4 -6
View File
@@ -1,11 +1,9 @@
#[cfg(feature = "alsa-widget")]
#[cfg(feature="alsa-widget")]
mod alsa_sound; mod alsa_sound;
#[cfg(feature="alsa-widget")] #[cfg(feature = "alsa-widget")]
pub use alsa_sound::Alsa; pub use alsa_sound::Alsa;
#[cfg(feature="pulseaudio-widget")] #[cfg(feature = "pulseaudio-widget")]
mod pulse_sound; mod pulse_sound;
#[cfg(feature="pulseaudio-widget")] #[cfg(feature = "pulseaudio-widget")]
pub use pulse_sound::PulseAudio; pub use pulse_sound::PulseAudio;
src/widgets/mod.rs
+1 -1
View File
@@ -6,5 +6,5 @@ pub mod clock;
pub mod date; pub mod date;
pub mod launcher; pub mod launcher;
#[cfg(any(feature="alsa-widget", feature="pulseaudio-widget"))] #[cfg(any(feature = "alsa-widget", feature = "pulseaudio-widget"))]
pub mod audio; pub mod audio;