A module rename to please clippy

src/layout.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::{fs::File, io::prelude::*, path::PathBuf};
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 
 fn split_space_to_parts_vertically(
     space_to_split: &PositionAndSize,

src/main.rs

@@ -7,10 +7,10 @@ mod errors;
 mod input;
 mod layout;
 mod os_input_output;
+mod panes;
 mod pty_bus;
 mod screen;
 mod tab;
-mod terminal_pane;
 mod utils;
 
 mod wasm_vm;
@@ -21,9 +21,9 @@ use std::path::PathBuf;
 use std::sync::mpsc::{channel, sync_channel, Receiver, SendError, Sender, SyncSender};
 use std::thread;
 
+use panes::PaneId;
 use serde::{Deserialize, Serialize};
 use structopt::StructOpt;
-use terminal_pane::PaneId;
 
 use crate::command_is_executing::CommandIsExecuting;
 use crate::errors::{AppContext, ContextType, ErrorContext, PtyContext, ScreenContext};

src/os_input_output.rs

@@ -1,4 +1,4 @@
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use nix::fcntl::{fcntl, FcntlArg, OFlag};
 use nix::pty::{forkpty, Winsize};
 use nix::sys::signal::{kill, Signal};

src/panes/plugin_pane.rs

@@ -4,7 +4,7 @@ use crate::{pty_bus::VteEvent, tab::Pane, wasm_vm::PluginInstruction, SenderWith
 
 use std::{sync::mpsc::channel, unimplemented};
 
-use crate::terminal_pane::{PaneId, PositionAndSize};
+use crate::panes::{PaneId, PositionAndSize};
 
 pub struct PluginPane {
     pub pid: u32,

src/panes/scroll.rs

@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 use std::fmt::{self, Debug, Formatter};
 
-use crate::terminal_pane::terminal_character::{
+use crate::panes::terminal_character::{
     CharacterStyles, TerminalCharacter, EMPTY_TERMINAL_CHARACTER,
 };
 

src/panes/terminal_pane.rs

@@ -5,8 +5,8 @@ use ::nix::pty::Winsize;
 use ::std::os::unix::io::RawFd;
 use ::vte::Perform;
 
-use crate::terminal_pane::terminal_character::{CharacterStyles, TerminalCharacter};
+use crate::panes::terminal_character::{CharacterStyles, TerminalCharacter};
-use crate::terminal_pane::Scroll;
+use crate::panes::Scroll;
 use crate::utils::logging::debug_log_to_file;
 use crate::VteEvent;
 

src/pty_bus.rs

@@ -14,7 +14,7 @@ use crate::os_input_output::OsApi;
 use crate::utils::logging::debug_to_file;
 use crate::{
     errors::{ContextType, ErrorContext},
-    terminal_pane::PaneId,
+    panes::PaneId,
 };
 use crate::{ScreenInstruction, SenderWithContext, OPENCALLS};
 

src/screen.rs

@@ -3,11 +3,11 @@ use std::os::unix::io::RawFd;
 use std::sync::mpsc::Receiver;
 
 use crate::os_input_output::OsApi;
+use crate::panes::PositionAndSize;
 use crate::pty_bus::{PtyInstruction, VteEvent};
 use crate::tab::Tab;
-use crate::terminal_pane::PositionAndSize;
 use crate::{errors::ErrorContext, wasm_vm::PluginInstruction};
-use crate::{layout::Layout, terminal_pane::PaneId};
+use crate::{layout::Layout, panes::PaneId};
 use crate::{AppInstruction, SenderWithContext};
 
 /*

src/tab.rs

@@ -1,6 +1,6 @@
+use crate::panes::{PaneId, PositionAndSize, TerminalPane};
 use crate::pty_bus::{PtyInstruction, VteEvent};
-use crate::terminal_pane::{PaneId, PositionAndSize, TerminalPane};
+use crate::{boundaries::Boundaries, panes::PluginPane};
-use crate::{boundaries::Boundaries, terminal_pane::PluginPane};
 use crate::{layout::Layout, wasm_vm::PluginInstruction};
 use crate::{os_input_output::OsApi, utils::shared::pad_to_size};
 use crate::{AppInstruction, SenderWithContext};
@@ -161,7 +161,7 @@ impl Tab {
             BTreeMap::new()
         };
         Tab {
-            index: index,
+            index,
             panes,
             max_panes,
             panes_to_hide: HashSet::new(),

src/tests/fakes.rs

@@ -1,4 +1,4 @@
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use std::collections::{HashMap, VecDeque};
 use std::io::Write;
 use std::os::unix::io::RawFd;

src/tests/integration/basic.rs

@@ -1,4 +1,4 @@
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use ::insta::assert_snapshot;
 
 use crate::tests::fakes::FakeInputOutput;

src/tests/integration/close_pane.rs

@@ -1,4 +1,4 @@
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use ::insta::assert_snapshot;
 
 use crate::tests::fakes::FakeInputOutput;

src/tests/integration/compatibility.rs

@@ -1,7 +1,7 @@
 use ::insta::assert_snapshot;
 use ::std::collections::HashMap;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::possible_tty_inputs::Bytes;
 use crate::tests::utils::get_output_frame_snapshots;

src/tests/integration/layouts.rs

@@ -1,7 +1,7 @@
 use insta::assert_snapshot;
 use std::path::PathBuf;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::commands::{COMMAND_TOGGLE, QUIT};
 use crate::tests::utils::get_output_frame_snapshots;

src/tests/integration/move_focus_down.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/move_focus_left.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/move_focus_right.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/move_focus_up.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/resize_down.rs

@@ -1,6 +1,6 @@
 use insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/resize_left.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/resize_right.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/resize_up.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/integration/tabs.rs

@@ -2,8 +2,8 @@ use ::insta::assert_snapshot;
 
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
+use crate::{panes::PositionAndSize, tests::utils::commands::CLOSE_FOCUSED_PANE};
 use crate::{start, Opt};
-use crate::{terminal_pane::PositionAndSize, tests::utils::commands::CLOSE_FOCUSED_PANE};
 
 use crate::tests::utils::commands::{
     CLOSE_TAB, COMMAND_TOGGLE, NEW_TAB, QUIT, SPLIT_HORIZONTALLY, SWITCH_NEXT_TAB, SWITCH_PREV_TAB,

src/tests/integration/toggle_fullscreen.rs

@@ -1,6 +1,6 @@
 use ::insta::assert_snapshot;
 
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
 use crate::tests::fakes::FakeInputOutput;
 use crate::tests::utils::get_output_frame_snapshots;
 use crate::{start, Opt};

src/tests/utils.rs

@@ -1,5 +1,5 @@
-use crate::terminal_pane::PositionAndSize;
+use crate::panes::PositionAndSize;
-use crate::terminal_pane::TerminalPane;
+use crate::panes::TerminalPane;
 
 pub fn get_output_frame_snapshots(
     output_frames: &[Vec<u8>],