diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/main.rs b/src/main.rs index 3cf6c2d..6b64f79 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,8 @@ use crate::run::Executor; macro_rules! print { ($($x:tt)*) => {{ - write!(io::stdout(), $($x)*).unwrap(); + let res = write!(io::stdout(), $($x)*); + res.unwrap(); io::stdout().flush().unwrap(); }} } @@ -47,11 +48,15 @@ macro_rules! println { () => {{ println!("") }}; - ($($x:tt)*) => {{ - write!(io::stdout(), $($x)*).unwrap(); - write!(io::stdout(), "\r\n").unwrap(); - io::stdout().flush().unwrap(); - }}; + ($($x:tt)*) => { + { + let res = write!(io::stdout(), $($x)*); + res.unwrap(); + let res = write!(io::stdout(), "\r\n"); + res.unwrap(); + io::stdout().flush().unwrap(); + } + }; } fn completely_clear_screen() { @@ -125,7 +130,7 @@ impl Session { fn clear_prompt(&mut self) { cursor::move_cursor(Direction::Right, self.line.distance_from_right_end()); for _ in 0..self.line.len() { - write!(io::stdout(), "\x08 \x08").unwrap(); + print!("\x08 \x08"); } io::stdout().lock().flush().unwrap(); self.line.clear(); @@ -318,7 +323,7 @@ fn event_loop() { // Ctrl+L 12 => { clear_screen(); - write!(io::stdout(), "{}", se.prompt()).unwrap(); + print!("{}", se.prompt()); io::stdout().write_all(&se.line.into_bytes()).unwrap(); cursor::move_cursor(Direction::Left, se.line.distance_from_right_end()); io::stdout().lock().flush().unwrap(); @@ -374,7 +379,7 @@ fn event_loop() { suggestions.sort_by(|x, y| x.delta.cmp(&y.delta)); suggestions.dedup_by(|x, y| x.delta == y.delta); - if suggestions.len() == 0 { + if suggestions.is_empty() { continue; } |