From 9cadb9bd8ced4394906ddf766c9bbaeda7648de1 Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Wed, 22 Jan 2020 10:20:29 +0900 Subject: [PATCH] Run rustfmt and replace depricated try!() macro with ? operator. No functional changes. --- src/buffer/mod.rs | 5 ++--- src/term_ui/screen.rs | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/buffer/mod.rs b/src/buffer/mod.rs index 9f85061..f4bf00d 100644 --- a/src/buffer/mod.rs +++ b/src/buffer/mod.rs @@ -44,7 +44,7 @@ impl Buffer { pub fn new_from_file(path: &Path) -> io::Result { let buf = Buffer { - text: Rope::from_reader(BufReader::new(try!(File::open(path))))?, + text: Rope::from_reader(BufReader::new(File::open(path)?))?, file_path: Some(path.to_path_buf()), undo_stack: UndoStack::new(), }; @@ -53,7 +53,7 @@ impl Buffer { } pub fn save_to_file(&self, path: &Path) -> io::Result<()> { - let mut f = BufWriter::new(try!(File::create(path))); + let mut f = BufWriter::new(File::create(path)?); for c in self.text.chunks() { let _ = f.write(c.as_bytes()); @@ -1482,5 +1482,4 @@ mod tests { assert!(None == iter.next()); } - } diff --git a/src/term_ui/screen.rs b/src/term_ui/screen.rs index 9dac65b..0faaccc 100644 --- a/src/term_ui/screen.rs +++ b/src/term_ui/screen.rs @@ -151,7 +151,8 @@ impl Drop for Screen { color::Fg(color::Reset), color::Bg(color::Reset), termion::clear::All, - ).unwrap(); + ) + .unwrap(); self.show_cursor(); } }