Get rid of WarningMessage parameter

src/app.rs

@@ -4,12 +4,12 @@ use ::std::path::PathBuf;
 use ::std::sync::mpsc::{Receiver, SyncSender};
 use ::tui::backend::Backend;
 
-use crate::messages::{handle_instructions, Instruction};
+use crate::Event;
+use crate::messages::{Instruction, handle_instructions};
 use crate::state::files::{FileOrFolder, FileTree, Folder};
 use crate::state::tiles::Board;
 use crate::state::{FileToDelete, UiEffects};
 use crate::ui::Display;
-use crate::Event;
 
 #[derive(Clone)]
 pub enum UiMode {
@@ -19,7 +19,7 @@ pub enum UiMode {
     DeleteFile(FileToDelete),
     ErrorMessage(String),
     Exiting { app_loaded: bool },
-    WarningMessage(FileToDelete),
+    WarningMessage,
 }
 
 pub struct App<B>
@@ -130,8 +130,8 @@ where
         };
     }
     pub fn show_warning_modal(&mut self) {
-        if let Some(file_to_delete) = self.get_file_to_delete() {
-            self.ui_mode = UiMode::WarningMessage(file_to_delete);
+        if let Some(_file_to_delete) = self.get_file_to_delete() {
+            self.ui_mode = UiMode::WarningMessage;
             self.render();
         }
     }

src/input/controls.rs

@@ -1,10 +1,10 @@
 use ::tui::backend::Backend;
 use crossterm::event::Event;
 use crossterm::event::KeyModifiers;
-use crossterm::event::{read, KeyCode, KeyEvent};
+use crossterm::event::{KeyCode, KeyEvent, read};
 
-use crate::state::FileToDelete;
 use crate::App;
+use crate::state::FileToDelete;
 
 #[derive(Clone)]
 pub struct TerminalEvents;

src/main.rs

@@ -15,10 +15,10 @@ use ::std::env;
 use ::std::io;
 use ::std::path::PathBuf;
 use ::std::process;
+use ::std::sync::Arc;
 use ::std::sync::atomic::{AtomicBool, Ordering};
 use ::std::sync::mpsc;
 use ::std::sync::mpsc::{Receiver, SyncSender};
-use ::std::sync::Arc;
 use ::std::thread::park_timeout;
 use ::std::{thread, time};
 use ::structopt::StructOpt;
@@ -31,7 +31,7 @@ use tui::backend::CrosstermBackend;
 
 use app::{App, UiMode};
 use input::TerminalEvents;
-use messages::{handle_events, Event, Instruction};
+use messages::{Event, Instruction, handle_events};
 
 #[cfg(not(test))]
 const SHOULD_SHOW_LOADING_ANIMATION: bool = true;

src/messages/instruction.rs

@@ -87,7 +87,7 @@ where
                     UiMode::Exiting { app_loaded: _ } => {
                         handle_keypress_exiting_mode(evt, app);
                     }
-                    UiMode::WarningMessage(_) => {
+                    UiMode::WarningMessage => {
                         handle_keypress_warning_message(evt, app);
                     }
                 }

src/state/files/file_tree.rs

@@ -2,8 +2,8 @@ use ::std::ffi::{OsStr, OsString};
 use ::std::fs::Metadata;
 use ::std::path::{Path, PathBuf};
 
-use crate::state::files::{FileOrFolder, Folder};
 use crate::state::FileToDelete;
+use crate::state::files::{FileOrFolder, Folder};
 
 pub struct FileTree {
     pub current_folder_names: Vec<OsString>,

src/state/tiles/board.rs

@@ -2,7 +2,7 @@ use ::tui::layout::Rect;
 
 use crate::state::files::Folder;
 use crate::state::tiles::files_in_folder::FileType;
-use crate::state::tiles::{files_in_folder, FileMetadata, Tile, TreeMap};
+use crate::state::tiles::{FileMetadata, Tile, TreeMap, files_in_folder};
 
 pub struct Board {
     pub tiles: Vec<Tile>,

src/tests/cases/ui.rs

@@ -1,5 +1,5 @@
 use ::std::env;
-use ::std::fs::{create_dir, create_dir_all, remove_dir_all, File};
+use ::std::fs::{File, create_dir, create_dir_all, remove_dir_all};
 use ::std::io::prelude::*;
 use ::std::iter;
 use ::std::path::{Path, PathBuf};

src/ui/bottom_line.rs

@@ -5,7 +5,7 @@ use ::tui::style::{Color, Modifier, Style};
 use ::tui::widgets::Widget;
 
 use crate::state::tiles::{FileType, Tile};
-use crate::ui::format::{truncate_middle, DisplaySize};
+use crate::ui::format::{DisplaySize, truncate_middle};
 
 fn render_currently_selected(buf: &mut Buffer, currently_selected: &Tile, max_len: u16, y: u16) {
     let file_name = currently_selected.name.to_string_lossy();
@@ -69,8 +69,10 @@ fn render_controls_legend(buf: &mut Buffer, hide_delete: bool, max_len: u16, y:
         )
     } else {
         (
-            String::from("<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit"),
-            String::from("←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del")
+            String::from(
+                "<arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit",
+            ),
+            String::from("←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del"),
         )
     };
     let too_small_line = "(...)";

src/ui/display.rs

@@ -1,16 +1,16 @@
 use ::std::path::PathBuf;
+use ::tui::Terminal;
 use ::tui::backend::Backend;
 use ::tui::layout::{Constraint, Direction, Layout, Rect};
-use ::tui::Terminal;
 
+use crate::UiMode;
+use crate::state::UiEffects;
 use crate::state::files::FileTree;
 use crate::state::tiles::Board;
-use crate::state::UiEffects;
 use crate::ui::grid::RectangleGrid;
 use crate::ui::modals::{ConfirmBox, ErrorBox, MessageBox, WarningBox};
 use crate::ui::title::TitleLine;
 use crate::ui::{BottomLine, TermTooSmall};
-use crate::UiMode;
 
 pub struct FolderInfo<'a> {
     pub path: &'a PathBuf,
@@ -273,7 +273,7 @@ where
                         );
                         f.render_widget(ConfirmBox::new(), full_screen);
                     }
-                    UiMode::WarningMessage(_) => {
+                    UiMode::WarningMessage => {
                         f.render_widget(
                             TitleLine::new(
                                 base_path_info,

src/ui/grid/draw_rect.rs

@@ -4,7 +4,7 @@ use ::tui::style::{Color, Modifier, Style};
 use ::unicode_width::UnicodeWidthStr;
 
 use crate::state::tiles::{FileType, Tile};
-use crate::ui::format::{truncate_middle, DisplaySize, DisplaySizeRounded};
+use crate::ui::format::{DisplaySize, DisplaySizeRounded, truncate_middle};
 use crate::ui::grid::{boundaries, draw_next_symbol};
 
 fn tile_first_line(tile: &Tile) -> String {

src/ui/modals/message_box.rs

@@ -3,8 +3,8 @@ use ::tui::layout::Rect;
 use ::tui::style::{Color, Modifier, Style};
 use ::tui::widgets::Widget;
 
-use crate::state::tiles::FileType;
 use crate::state::FileToDelete;
+use crate::state::tiles::FileType;
 use crate::ui::format::truncate_middle;
 use crate::ui::grid::draw_filled_rect;
 

src/ui/title/title_line.rs

@@ -4,9 +4,9 @@ use ::tui::layout::Rect;
 use ::tui::style::{Color, Modifier, Style};
 use ::tui::widgets::Widget;
 
+use crate::ui::FolderInfo;
 use crate::ui::format::DisplaySize;
 use crate::ui::title::{CellSizeOpt, TitleTelescope};
-use crate::ui::FolderInfo;
 
 #[cfg(not(target_os = "windows"))]
 use crate::os::unix::is_user_admin;