From 0dd379141d3918309b49815f828a5afaaa35297a Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Tue, 24 Jul 2018 14:38:46 +0300 Subject: [PATCH] Fix some indentation --- ui/src/lib.rs | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/ui/src/lib.rs b/ui/src/lib.rs index 76af9dca7..cb76078f7 100644 --- a/ui/src/lib.rs +++ b/ui/src/lib.rs @@ -360,8 +360,8 @@ impl State { return; }, UIEventType::EditDraft(dir) => { - use std::process::{Command, Stdio}; - use std::io::Read; + use std::process::{Command, Stdio}; + use std::io::Read; let mut output = Command::new("msmtp") .arg("-t") .stdin(Stdio::piped()) @@ -371,14 +371,14 @@ impl State { { let mut in_pipe = output.stdin.as_mut().unwrap(); let mut buf = Vec::new(); - let mut f = std::fs::File::open(&dir).unwrap(); + let mut f = std::fs::File::open(&dir).unwrap(); f.read_to_end(&mut buf).unwrap(); in_pipe.write(&buf).unwrap(); } let output = output.wait_with_output().expect("Failed to read stdout"); - return; + return; }, UIEventType::Input(Key::Char('t')) => for i in 0..self.entities.len() { @@ -410,27 +410,27 @@ impl State { pub fn try_wait_on_child(&mut self) -> Option { if { match self.child { - Some(ForkType::NewDraft(_,ref mut c)) => { - let mut w = c.try_wait(); - match w { - Ok(Some(_)) => { true }, - Ok(None) => { false }, - Err(_) => { return None; }, + Some(ForkType::NewDraft(_,ref mut c)) => { + let mut w = c.try_wait(); + match w { + Ok(Some(_)) => { true }, + Ok(None) => { false }, + Err(_) => { return None; }, + } + }, + Some(ForkType::Generic(ref mut c)) => { + let mut w = c.try_wait(); + match w { + Ok(Some(_)) => { true }, + Ok(None) => { false }, + Err(_) => { return None; }, + } + }, + _ => { + return None; } - }, - Some(ForkType::Generic(ref mut c)) => { - let mut w = c.try_wait(); - match w { - Ok(Some(_)) => { true }, - Ok(None) => { false }, - Err(_) => { return None; }, - } - }, - _ => { - return None; } } - } { if let Some(ForkType::NewDraft(f, _)) = std::mem::replace(&mut self.child, None) { self.rcv_event(UIEvent { id: 0, event_type: UIEventType::EditDraft(f) }); @@ -529,22 +529,22 @@ impl From for Key { * The main loop uses try_wait_on_child() to check if child has exited. */ pub fn get_events(stdin: std::io::Stdin, mut closure: impl FnMut(Key), mut exit: impl FnMut(), rx: chan::Receiver) -> (){ - for c in stdin.keys() { - chan_select! { - default => {}, - rx.recv() -> val => { - if let Some(true) = val { - exit(); - return; - } else if let Some(false) = val { - return; - } - } - - - }; - if let Ok(k) = c { - closure(Key::from(k)); + for c in stdin.keys() { + chan_select! { + default => {}, + rx.recv() -> val => { + if let Some(true) = val { + exit(); + return; + } else if let Some(false) = val { + return; + } } + + + }; + if let Ok(k) = c { + closure(Key::from(k)); } + } }