feat: add rustfmt, update action workflow to check for formatting (#45)

12 files changed, 484 insertions, 255 deletions

diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs
index a9f34778..109424cf 100644
--- a/src/tests/fakes.rs
+++ b/src/tests/fakes.rs
@@ -1,13 +1,13 @@
-use ::std::time::Duration;
 use ::nix::pty::Winsize;
-use ::std::os::unix::io::RawFd;
-use ::std::io::{Read, Write};
 use ::std::collections::HashMap;
-use ::std::sync::{Arc, Mutex};
+use ::std::io::{Read, Write};
+use ::std::os::unix::io::RawFd;
 use ::std::path::PathBuf;
+use ::std::sync::{Arc, Mutex};
+use ::std::time::Duration;
 
 use crate::os_input_output::OsApi;
-use crate::tests::possible_tty_inputs::{Bytes, get_possible_tty_inputs};
+use crate::tests::possible_tty_inputs::{get_possible_tty_inputs, Bytes};
 
 #[derive(Clone)]
 pub enum IoEvent {
@@ -87,7 +87,7 @@ pub struct FakeInputOutput {
 impl FakeInputOutput {
     pub fn new(winsize: Winsize) -> Self {
         let mut win_sizes = HashMap::new();
-        win_sizes.insert(0 , winsize); // 0 is the current terminal
+        win_sizes.insert(0, winsize); // 0 is the current terminal
         FakeInputOutput {
             read_buffers: Arc::new(Mutex::new(HashMap::new())),
             stdin_writes: Arc::new(Mutex::new(HashMap::new())),
@@ -117,15 +117,30 @@ impl OsApi for FakeInputOutput {
         *winsize
     }
     fn set_terminal_size_using_fd(&mut self, pid: RawFd, cols: u16, rows: u16) {
-        let terminal_input = self.possible_tty_inputs.get(&cols).expect(&format!("could not find input for size {:?}", cols));
-        self.read_buffers.lock().unwrap().insert(pid, terminal_input.clone());
-        self.io_events.lock().unwrap().push(IoEvent::SetTerminalSizeUsingFd(pid, cols, rows));
+        let terminal_input = self
+            .possible_tty_inputs
+            .get(&cols)
+            .expect(&format!("could not find input for size {:?}", cols));
+        self.read_buffers
+            .lock()
+            .unwrap()
+            .insert(pid, terminal_input.clone());
+        self.io_events
+            .lock()
+            .unwrap()
+            .push(IoEvent::SetTerminalSizeUsingFd(pid, cols, rows));
     }
     fn into_raw_mode(&mut self, pid: RawFd) {
-        self.io_events.lock().unwrap().push(IoEvent::IntoRawMode(pid));
+        self.io_events
+            .lock()
+            .unwrap()
+            .push(IoEvent::IntoRawMode(pid));
     }
     fn unset_raw_mode(&mut self, pid: RawFd) {
-        self.io_events.lock().unwrap().push(IoEvent::UnsetRawMode(pid));
+        self.io_events
+            .lock()
+            .unwrap()
+            .push(IoEvent::UnsetRawMode(pid));
     }
     fn spawn_terminal(&mut self, _file_to_open: Option<PathBuf>) -> (RawFd, RawFd) {
         let next_terminal_id = { self.read_buffers.lock().unwrap().keys().len() as RawFd + 1 };
@@ -158,7 +173,7 @@ impl OsApi for FakeInputOutput {
                         bytes.set_read_position(bytes_read);
                     }
                     return Ok(bytes_read);
-                },
+                }
                 None => {
                     attempts_left -= 1;
                 }
diff --git a/src/tests/integration/basic.rs b/src/tests/integration/basic.rs
index a7e84ad0..6640b6e6 100644
--- a/src/tests/integration/basic.rs
+++ b/src/tests/integration/basic.rs
@@ -1,29 +1,20 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
-use crate::tests::utils::get_output_frame_snapshots;
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
-    SPLIT_VERTICALLY,
-    RESIZE_UP,
-    MOVE_FOCUS,
-    RESIZE_LEFT,
-    RESIZE_RIGHT,
-    SPAWN_TERMINAL,
-    QUIT,
-    SCROLL_UP,
-    SCROLL_DOWN,
-    TOGGLE_ACTIVE_TERMINAL_FULLSCREEN,
+    MOVE_FOCUS, QUIT, RESIZE_LEFT, RESIZE_RIGHT, RESIZE_UP, SCROLL_DOWN, SCROLL_UP, SPAWN_TERMINAL,
+    SPLIT_HORIZONTALLY, SPLIT_VERTICALLY, TOGGLE_ACTIVE_TERMINAL_FULLSCREEN,
 };
+use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
 #[test]
-pub fn starts_with_one_terminal () {
+pub fn starts_with_one_terminal() {
     let fake_win_size = Winsize {
         ws_col: 121,
         ws_row: 20,
@@ -33,7 +24,11 @@ pub fn starts_with_one_terminal () {
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -49,12 +44,13 @@ pub fn split_terminals_vertically() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -70,12 +66,13 @@ pub fn split_terminals_horizontally() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_HORIZONTALLY,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -83,7 +80,7 @@ pub fn split_terminals_horizontally() {
 }
 
 #[test]
-pub fn split_largest_terminal () {
+pub fn split_largest_terminal() {
     // this finds the largest pane and splits along its longest edge (vertically or horizontally)
     let fake_win_size = Winsize {
         ws_col: 121,
@@ -92,14 +89,13 @@ pub fn split_largest_terminal () {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPAWN_TERMINAL,
-        SPAWN_TERMINAL,
-        SPAWN_TERMINAL,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPAWN_TERMINAL, SPAWN_TERMINAL, SPAWN_TERMINAL, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -144,7 +140,11 @@ pub fn resize_right_and_up_on_the_same_axis() {
         QUIT,
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -170,7 +170,11 @@ pub fn scrolling_inside_a_pane() {
         QUIT,
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -178,7 +182,7 @@ pub fn scrolling_inside_a_pane() {
 }
 
 #[test]
-pub fn max_panes () {
+pub fn max_panes() {
     // with the --max-panes option, we only allow a certain amount of panes on screen
     // simultaneously, new panes beyond this limit will close older panes on screen
     let fake_win_size = Winsize {
@@ -193,12 +197,16 @@ pub fn max_panes () {
         SPAWN_TERMINAL,
         SPAWN_TERMINAL,
         SPAWN_TERMINAL,
-        QUIT
+        QUIT,
     ]);
     let mut opts = Opt::default();
     opts.max_panes = Some(4);
     start(Box::new(fake_input_output.clone()), opts);
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -206,7 +214,7 @@ pub fn max_panes () {
 }
 
 #[test]
-pub fn toggle_focused_pane_fullscreen () {
+pub fn toggle_focused_pane_fullscreen() {
     let fake_win_size = Winsize {
         ws_col: 121,
         ws_row: 20,
@@ -229,12 +237,16 @@ pub fn toggle_focused_pane_fullscreen () {
         MOVE_FOCUS,
         TOGGLE_ACTIVE_TERMINAL_FULLSCREEN,
         TOGGLE_ACTIVE_TERMINAL_FULLSCREEN,
-        QUIT
+        QUIT,
     ]);
     let mut opts = Opt::default();
     opts.max_panes = Some(4);
     start(Box::new(fake_input_output.clone()), opts);
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/close_pane.rs b/src/tests/integration/close_pane.rs
index ddb41d1e..ba44ec08 100644
--- a/src/tests/integration/close_pane.rs
+++ b/src/tests/integration/close_pane.rs
@@ -1,22 +1,16 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
+    CLOSE_FOCUSED_PANE, MOVE_FOCUS, QUIT, RESIZE_DOWN, RESIZE_LEFT, RESIZE_UP, SPLIT_HORIZONTALLY,
     SPLIT_VERTICALLY,
-    RESIZE_DOWN,
-    RESIZE_UP,
-    MOVE_FOCUS,
-    RESIZE_LEFT,
-    QUIT,
-    CLOSE_FOCUSED_PANE,
 };
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
@@ -37,14 +31,14 @@ pub fn close_pane_with_another_pane_above_it() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_HORIZONTALLY,
-        CLOSE_FOCUSED_PANE,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, CLOSE_FOCUSED_PANE, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -76,7 +70,11 @@ pub fn close_pane_with_another_pane_below_it() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -98,14 +96,14 @@ pub fn close_pane_with_another_pane_to_the_left() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        CLOSE_FOCUSED_PANE,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, CLOSE_FOCUSED_PANE, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -127,15 +125,14 @@ pub fn close_pane_with_another_pane_to_the_right() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        MOVE_FOCUS,
-        CLOSE_FOCUSED_PANE,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, MOVE_FOCUS, CLOSE_FOCUSED_PANE, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -170,7 +167,11 @@ pub fn close_pane_with_multiple_panes_above_it() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -203,7 +204,11 @@ pub fn close_pane_with_multiple_panes_below_it() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -238,7 +243,11 @@ pub fn close_pane_with_multiple_panes_to_the_left() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -271,7 +280,11 @@ pub fn close_pane_with_multiple_panes_to_the_right() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -318,7 +331,11 @@ pub fn close_pane_with_multiple_panes_above_it_away_from_screen_edges() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -365,7 +382,11 @@ pub fn close_pane_with_multiple_panes_below_it_away_from_screen_edges() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -414,7 +435,11 @@ pub fn close_pane_with_multiple_panes_to_the_left_away_from_screen_edges() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -463,7 +488,11 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -489,7 +518,11 @@ pub fn closing_last_pane_exits_app() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs
index e6a913e6..a7cd375c 100644
--- a/src/tests/integration/compatibility.rs
+++ b/src/tests/integration/compatibility.rs
@@ -1,11 +1,11 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 use ::std::collections::HashMap;
 
-use crate::{start, Opt};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::possible_tty_inputs::Bytes;
-use crate::tests::fakes::{FakeInputOutput};
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::QUIT;
 
@@ -22,7 +22,7 @@ use crate::tests::utils::commands::QUIT;
  *
  */
 
-fn get_fake_os_input (fake_win_size: &Winsize, fixture_name: &str) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize, fixture_name: &str) -> FakeInputOutput {
     let mut tty_inputs = HashMap::new();
     let fixture_bytes = Bytes::from_file_in_fixtures(&fixture_name);
     tty_inputs.insert(fake_win_size.ws_col, fixture_bytes);
@@ -41,7 +41,11 @@ pub fn run_bandwhich_from_fish_shell() {
     let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -60,7 +64,11 @@ pub fn fish_tab_completion_options() {
     let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -84,7 +92,11 @@ pub fn fish_select_tab_completion_options() {
     let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -92,7 +104,7 @@ pub fn fish_select_tab_completion_options() {
 }
 
 #[test]
-pub fn vim_scroll_region_down () {
+pub fn vim_scroll_region_down() {
     // here we test a case where vim defines the scroll region as lesser than the screen row count
     // and then scrolls down
     // the region is defined here by vim as 1-26 (there are 28 rows)
@@ -113,7 +125,11 @@ pub fn vim_scroll_region_down () {
     // fake_input_output.add_terminal_input(&[17]); // quit (ctrl-q)
     fake_input_output.add_terminal_input(&[QUIT]); // quit (ctrl-q)
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -138,7 +154,11 @@ pub fn vim_ctrl_d() {
     let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -162,7 +182,11 @@ pub fn vim_ctrl_u() {
     let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
     fake_input_output.add_terminal_input(&[QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/mod.rs b/src/tests/integration/mod.rs
index 138f36a7..677af578 100644
--- a/src/tests/integration/mod.rs
+++ b/src/tests/integration/mod.rs
@@ -1,7 +1,7 @@
 pub mod basic;
+pub mod close_pane;
 pub mod compatibility;
-pub mod resize_right;
+pub mod resize_down;
 pub mod resize_left;
+pub mod resize_right;
 pub mod resize_up;
-pub mod resize_down;
-pub mod close_pane;
diff --git a/src/tests/integration/resize_down.rs b/src/tests/integration/resize_down.rs
index 732c01a7..cd149c59 100644
--- a/src/tests/integration/resize_down.rs
+++ b/src/tests/integration/resize_down.rs
@@ -1,20 +1,15 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
-    SPLIT_VERTICALLY,
-    RESIZE_DOWN,
-    MOVE_FOCUS,
-    RESIZE_LEFT,
-    QUIT,
+    MOVE_FOCUS, QUIT, RESIZE_DOWN, RESIZE_LEFT, SPLIT_HORIZONTALLY, SPLIT_VERTICALLY,
 };
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
@@ -25,7 +20,7 @@ pub fn resize_down_with_pane_above() {
     // │           │                  │           │
     // ├───────────┤ ==resize=down==> │           │
     // │███████████│                  ├───────────┤
-    // │███████████│                  │███████████│  
+    // │███████████│                  │███████████│
     // │███████████│                  │███████████│
     // └───────────┘                  └───────────┘
     // █ == focused pane
@@ -36,14 +31,14 @@ pub fn resize_down_with_pane_above() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_HORIZONTALLY,
-        RESIZE_DOWN,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, RESIZE_DOWN, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -67,14 +62,14 @@ pub fn resize_down_with_pane_below() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY,
-        MOVE_FOCUS,
-        RESIZE_DOWN,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, MOVE_FOCUS, RESIZE_DOWN, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -111,7 +106,11 @@ pub fn resize_down_with_panes_above_and_below() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -148,7 +147,11 @@ pub fn resize_down_with_multiple_panes_above() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -187,7 +190,11 @@ pub fn resize_down_with_panes_above_aligned_left_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -225,7 +232,11 @@ pub fn resize_down_with_panes_below_aligned_left_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -261,7 +272,11 @@ pub fn resize_down_with_panes_above_aligned_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -298,7 +313,11 @@ pub fn resize_down_with_panes_below_aligned_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -338,7 +357,11 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -380,7 +403,11 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -437,7 +464,11 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_panes_to_the_lef
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -496,7 +527,11 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_to_the_left_and_
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/resize_left.rs b/src/tests/integration/resize_left.rs
index ad59b85e..87c746ca 100644
--- a/src/tests/integration/resize_left.rs
+++ b/src/tests/integration/resize_left.rs
@@ -1,20 +1,15 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
-    SPLIT_VERTICALLY,
-    RESIZE_UP,
-    MOVE_FOCUS,
-    RESIZE_LEFT,
-    QUIT,
+    MOVE_FOCUS, QUIT, RESIZE_LEFT, RESIZE_UP, SPLIT_HORIZONTALLY, SPLIT_VERTICALLY,
 };
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
@@ -33,14 +28,14 @@ pub fn resize_left_with_pane_to_the_left() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        RESIZE_LEFT,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, RESIZE_LEFT, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -62,15 +57,14 @@ pub fn resize_left_with_pane_to_the_right() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        MOVE_FOCUS,
-        RESIZE_LEFT,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, MOVE_FOCUS, RESIZE_LEFT, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -102,7 +96,11 @@ pub fn resize_left_with_panes_to_the_left_and_right() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -137,7 +135,11 @@ pub fn resize_left_with_multiple_panes_to_the_left() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -174,7 +176,11 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -208,7 +214,11 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -244,7 +254,11 @@ pub fn resize_left_with_panes_to_the_left_aligned_bottom_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -279,7 +293,11 @@ pub fn resize_left_with_panes_to_the_right_aligned_bottom_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -319,7 +337,11 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_current_pa
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -361,7 +383,11 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_current_p
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -418,7 +444,11 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abov
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -435,7 +465,8 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_panes_abo
     // ├─────┼─────┤                    ├───┴─┬─────┤
     // └─────┴─────┘                    └─────┴─────┘
     // █ == focused pane
-    let fake_win_size = Winsize { // TODO: combine with above
+    let fake_win_size = Winsize {
+        // TODO: combine with above
         ws_col: 121,
         ws_row: 40,
         ws_xpixel: 0,
@@ -477,7 +508,11 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_panes_abo
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/resize_right.rs b/src/tests/integration/resize_right.rs
index ee809b41..b2201591 100644
--- a/src/tests/integration/resize_right.rs
+++ b/src/tests/integration/resize_right.rs
@@ -1,20 +1,15 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
-    SPLIT_VERTICALLY,
-    RESIZE_UP,
-    MOVE_FOCUS,
-    RESIZE_RIGHT,
-    QUIT,
+    MOVE_FOCUS, QUIT, RESIZE_RIGHT, RESIZE_UP, SPLIT_HORIZONTALLY, SPLIT_VERTICALLY,
 };
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
@@ -33,14 +28,14 @@ pub fn resize_right_with_pane_to_the_left() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        RESIZE_RIGHT,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, RESIZE_RIGHT, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -62,15 +57,14 @@ pub fn resize_right_with_pane_to_the_right() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_VERTICALLY,
-        MOVE_FOCUS,
-        RESIZE_RIGHT,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_VERTICALLY, MOVE_FOCUS, RESIZE_RIGHT, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -102,7 +96,11 @@ pub fn resize_right_with_panes_to_the_left_and_right() {
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -137,7 +135,11 @@ pub fn resize_right_with_multiple_panes_to_the_left() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -174,7 +176,11 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -208,7 +214,11 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -244,7 +254,11 @@ pub fn resize_right_with_panes_to_the_left_aligned_bottom_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -279,7 +293,11 @@ pub fn resize_right_with_panes_to_the_right_aligned_bottom_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -314,12 +332,16 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_current_p
         MOVE_FOCUS,
         SPLIT_VERTICALLY,
         RESIZE_RIGHT,
-        QUIT
+        QUIT,
     ]);
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -361,7 +383,11 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_current_
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -418,7 +444,11 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abo
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -477,7 +507,11 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_panes_ab
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/integration/resize_up.rs b/src/tests/integration/resize_up.rs
index 4b0fcc45..d4e75376 100644
--- a/src/tests/integration/resize_up.rs
+++ b/src/tests/integration/resize_up.rs
@@ -1,20 +1,15 @@
-use ::nix::pty::Winsize;
 use ::insta::assert_snapshot;
+use ::nix::pty::Winsize;
 
-use crate::{start, Opt};
-use crate::tests::fakes::{FakeInputOutput};
+use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{start, Opt};
 
 use crate::tests::utils::commands::{
-    SPLIT_HORIZONTALLY,
-    SPLIT_VERTICALLY,
-    RESIZE_UP,
-    MOVE_FOCUS,
-    RESIZE_LEFT,
-    QUIT,
+    MOVE_FOCUS, QUIT, RESIZE_LEFT, RESIZE_UP, SPLIT_HORIZONTALLY, SPLIT_VERTICALLY,
 };
 
-fn get_fake_os_input (fake_win_size: &Winsize) -> FakeInputOutput {
+fn get_fake_os_input(fake_win_size: &Winsize) -> FakeInputOutput {
     FakeInputOutput::new(fake_win_size.clone())
 }
 
@@ -35,14 +30,14 @@ pub fn resize_up_with_pane_above() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_HORIZONTALLY,
-        RESIZE_UP,
-        QUIT
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, RESIZE_UP, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -66,15 +61,14 @@ pub fn resize_up_with_pane_below() {
         ws_ypixel: 0,
     };
     let mut fake_input_output = get_fake_os_input(&fake_win_size);
-    fake_input_output.add_terminal_input(&[
-        SPLIT_HORIZONTALLY,
-        MOVE_FOCUS,
-        RESIZE_UP,
-        QUIT,
-    ]);
+    fake_input_output.add_terminal_input(&[SPLIT_HORIZONTALLY, MOVE_FOCUS, RESIZE_UP, QUIT]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -104,13 +98,18 @@ pub fn resize_up_with_panes_above_and_below() {
     fake_input_output.add_terminal_input(&[
         SPLIT_HORIZONTALLY,
         SPLIT_HORIZONTALLY,
-        MOVE_FOCUS, MOVE_FOCUS,
+        MOVE_FOCUS,
+        MOVE_FOCUS,
         RESIZE_UP,
         QUIT,
     ]);
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -146,7 +145,11 @@ pub fn resize_up_with_multiple_panes_above() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -183,7 +186,11 @@ pub fn resize_up_with_panes_above_aligned_left_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -216,12 +223,16 @@ pub fn resize_up_with_panes_below_aligned_left_with_current_pane() {
         MOVE_FOCUS,
         MOVE_FOCUS,
         RESIZE_UP,
-        QUIT
+        QUIT,
     ]);
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -257,7 +268,11 @@ pub fn resize_up_with_panes_above_aligned_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -294,7 +309,11 @@ pub fn resize_up_with_panes_below_aligned_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -334,7 +353,11 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_current_pane() {
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -371,12 +394,16 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_current_pane() {
         MOVE_FOCUS,
         MOVE_FOCUS,
         RESIZE_UP,
-        QUIT
+        QUIT,
     ]);
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -433,7 +460,11 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_panes_to_the_left_
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
@@ -492,7 +523,11 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_to_the_left_and_ri
 
     start(Box::new(fake_input_output.clone()), Opt::default());
 
-    let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap();
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
     let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
     for snapshot in snapshots {
         assert_snapshot!(snapshot);
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index 5bf3c0ea..6e07c96d 100644
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -1,5 +1,5 @@
+pub mod fakes;
 pub mod integration;
 pub mod possible_tty_inputs;
 pub mod tty_inputs;
-pub mod fakes;
 pub mod utils;
diff --git a/src/tests/possible_tty_inputs.rs b/src/tests/possible_tty_inputs.rs
index dd6e1e7d..6730591f 100644
--- a/src/tests/possible_tty_inputs.rs
+++ b/src/tests/possible_tty_inputs.rs
@@ -1,7 +1,10 @@
+use crate::tests::tty_inputs::{
+    COL_10, COL_121, COL_14, COL_15, COL_19, COL_20, COL_24, COL_29, COL_30, COL_34, COL_39,
+    COL_40, COL_50, COL_60, COL_70, COL_90,
+};
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
-use crate::tests::tty_inputs::{COL_10, COL_60, COL_14, COL_15, COL_19, COL_20, COL_24, COL_29, COL_30, COL_34, COL_39, COL_40, COL_50, COL_70, COL_90, COL_121};
 
 #[derive(Clone, Debug)]
 pub struct Bytes {
@@ -13,7 +16,7 @@ impl Bytes {
     pub fn new() -> Self {
         Bytes {
             content: vec![],
-            read_position: 0
+            read_position: 0,
         }
     }
     pub fn from_file_in_fixtures(file_name: &str) -> Self {
@@ -22,10 +25,11 @@ impl Bytes {
         path_to_file.push("tests");
         path_to_file.push("fixtures");
         path_to_file.push(file_name);
-        let content = fs::read(path_to_file).expect(&format!("could not read fixture {:?}", &file_name));
+        let content =
+            fs::read(path_to_file).expect(&format!("could not read fixture {:?}", &file_name));
         Bytes {
             content,
-            read_position: 0
+            read_position: 0,
         }
     }
     pub fn content_from_str(mut self, content: &[&'static str]) -> Self {
@@ -43,7 +47,8 @@ impl Bytes {
     }
 }
 
-pub fn get_possible_tty_inputs () -> HashMap<u16, Bytes> { // the key is the column count for this terminal input
+pub fn get_possible_tty_inputs() -> HashMap<u16, Bytes> {
+    // the key is the column count for this terminal input
     let mut possible_inputs = HashMap::new();
     let col_10_bytes = Bytes::new().content_from_str(&COL_10);
     let col_14_bytes = Bytes::new().content_from_str(&COL_14);
diff --git a/src/tests/utils.rs b/src/tests/utils.rs
index a416a177..de19ff4f 100644
--- a/src/tests/utils.rs
+++ b/src/tests/utils.rs
@@ -1,5 +1,5 @@
-use ::nix::pty::Winsize;
 use crate::terminal_pane::TerminalPane;
+use ::nix::pty::Winsize;
 
 pub fn get_output_frame_snapshots(output_frames: &[Vec<u8>], win_size: &Winsize) -> Vec<String> {
     let mut vte_parser = vte::Parser::new();
@@ -48,5 +48,6 @@ pub mod commands {
     pub const SCROLL_UP: [u8; 10] = [27, 91, 53, 94, 0, 0, 0, 0, 0, 0]; // ctrl-PgUp
     pub const SCROLL_DOWN: [u8; 10] = [27, 91, 54, 94, 0, 0, 0, 0, 0, 0]; // ctrl-PgDown
     pub const CLOSE_FOCUSED_PANE: [u8; 10] = [24, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // ctrl-x
-    pub const TOGGLE_ACTIVE_TERMINAL_FULLSCREEN: [u8; 10] = [5, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // ctrl-e
+    pub const TOGGLE_ACTIVE_TERMINAL_FULLSCREEN: [u8; 10] = [5, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    // ctrl-e
 }