test: Updated Rust edition to 2024 and refactored network module tests to be more idiomatic

src/ui/radarr_ui/library/add_movie_ui.rs

@@ -1,13 +1,13 @@
 use std::sync::atomic::Ordering;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::widgets::{Cell, ListItem, Row};
-use ratatui::Frame;
 
+use crate::models::Route;
 use crate::models::radarr_models::AddMovieSearchResult;
 use crate::models::servarr_data::radarr::modals::AddMovieModal;
-use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
-use crate::models::Route;
+use crate::models::servarr_data::radarr::radarr_data::{ADD_MOVIE_BLOCKS, ActiveRadarrBlock};
 use crate::ui::radarr_ui::collections::CollectionsUi;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
@@ -19,9 +19,9 @@ use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::message::Message;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 use crate::utils::convert_runtime;
-use crate::{render_selectable_input_box, App};
+use crate::{App, render_selectable_input_box};
 
 #[cfg(test)]
 #[path = "add_movie_ui_tests.rs"]
@@ -297,19 +297,27 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 
   f.render_widget(title_block_centered(&title), area);
 
-  let [paragraph_area, root_folder_area, monitor_area, min_availability_area, quality_profile_area, tags_area, _, buttons_area] =
-    Layout::vertical([
-      Constraint::Length(6),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-    ])
-    .margin(1)
-    .areas(area);
+  let [
+    paragraph_area,
+    root_folder_area,
+    monitor_area,
+    min_availability_area,
+    quality_profile_area,
+    tags_area,
+    _,
+    buttons_area,
+  ] = Layout::vertical([
+    Constraint::Length(6),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Fill(1),
+    Constraint::Length(3),
+  ])
+  .margin(1)
+  .areas(area);
 
   let prompt_paragraph = layout_paragraph_borderless(&prompt);
   f.render_widget(prompt_paragraph, paragraph_area);

src/ui/radarr_ui/library/add_movie_ui_tests.rs

@@ -2,9 +2,9 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
+  use crate::models::servarr_data::radarr::radarr_data::{ADD_MOVIE_BLOCKS, ActiveRadarrBlock};
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
 
   #[test]
   fn test_add_movie_ui_accepts() {

src/ui/radarr_ui/library/delete_movie_ui.rs

@@ -1,13 +1,13 @@
-use ratatui::layout::Rect;
 use ratatui::Frame;
+use ratatui::layout::Rect;
 
 use crate::app::App;
-use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::models::Route;
+use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
+use crate::ui::DrawUi;
 use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 
 #[cfg(test)]
 #[path = "delete_movie_ui_tests.rs"]

src/ui/radarr_ui/library/delete_movie_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
 
   #[test]
   fn test_delete_movie_ui_accepts() {

src/ui/radarr_ui/library/edit_movie_ui.rs

@@ -1,16 +1,16 @@
 use std::sync::atomic::Ordering;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::prelude::Layout;
 use ratatui::widgets::ListItem;
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::modals::EditMovieModal;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, EDIT_MOVIE_BLOCKS, MOVIE_DETAILS_BLOCKS,
 };
-use crate::models::Route;
 use crate::render_selectable_input_box;
 use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;
 
@@ -21,7 +21,7 @@ use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 
 #[cfg(test)]
 #[path = "edit_movie_ui_tests.rs"]
@@ -40,10 +40,10 @@ impl DrawUi for EditMovieUi {
 
   fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
     if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
-      if let Some(context) = context_option {
-        if MOVIE_DETAILS_BLOCKS.contains(&context) {
-          draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
-        }
+      if let Some(context) = context_option
+        && MOVIE_DETAILS_BLOCKS.contains(&context)
+      {
+        draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
       }
 
       draw_popup(f, app, draw_edit_movie_confirmation_prompt, Size::Medium);
@@ -92,19 +92,27 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, path_area, tags_area, _, buttons_area] =
-    Layout::vertical([
-      Constraint::Length(6),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-    ])
-    .margin(1)
-    .areas(area);
+  let [
+    paragraph_area,
+    monitored_area,
+    min_availability_area,
+    quality_profile_area,
+    path_area,
+    tags_area,
+    _,
+    buttons_area,
+  ] = Layout::vertical([
+    Constraint::Length(6),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Fill(1),
+    Constraint::Length(3),
+  ])
+  .margin(1)
+  .areas(area);
   let [save_area, cancel_area] =
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);

src/ui/radarr_ui/library/edit_movie_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
 
   #[test]
   fn test_edit_movie_ui_accepts() {

src/ui/radarr_ui/library/library_ui_tests.rs

@@ -3,11 +3,11 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{
-    ActiveRadarrBlock, ADD_MOVIE_BLOCKS, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
+    ADD_MOVIE_BLOCKS, ActiveRadarrBlock, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
     MOVIE_DETAILS_BLOCKS,
   };
-  use crate::ui::radarr_ui::library::LibraryUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::LibraryUi;
 
   #[test]
   fn test_library_ui_accepts() {

src/ui/radarr_ui/library/mod.rs

@@ -1,11 +1,12 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::Movie;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, LIBRARY_BLOCKS};
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::radarr_ui::decorate_with_row_style;
 use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
 use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
@@ -15,7 +16,6 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 use crate::utils::{convert_runtime, convert_to_gb};
 
 mod add_movie_ui;

src/ui/radarr_ui/library/movie_details_ui.rs

@@ -1,17 +1,17 @@
 use std::iter;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
-use ratatui::Frame;
 use serde_json::Number;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::{Credit, MovieHistoryItem, RadarrRelease};
 use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
-use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
   borderless_block, decorate_peer_style, get_width_from_percentage, layout_block_bottom_border,
@@ -21,7 +21,7 @@ use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::{draw_popup, draw_tabs, DrawUi};
+use crate::ui::{DrawUi, draw_popup, draw_tabs};
 use crate::utils::convert_to_gb;
 
 #[cfg(test)]
@@ -117,16 +117,22 @@ fn draw_file_info(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       let file_info = movie_details_modal.file_details.to_owned();
       let audio_details = movie_details_modal.audio_details.to_owned();
       let video_details = movie_details_modal.video_details.to_owned();
-      let [file_details_title_area, file_details_area, audio_details_title_area, audio_details_area, video_details_title_area, video_details_area] =
-        Layout::vertical([
-          Constraint::Length(2),
-          Constraint::Length(5),
-          Constraint::Length(1),
-          Constraint::Length(6),
-          Constraint::Length(1),
-          Constraint::Length(7),
-        ])
-        .areas(area);
+      let [
+        file_details_title_area,
+        file_details_area,
+        audio_details_title_area,
+        audio_details_area,
+        video_details_title_area,
+        video_details_area,
+      ] = Layout::vertical([
+        Constraint::Length(2),
+        Constraint::Length(5),
+        Constraint::Length(1),
+        Constraint::Length(6),
+        Constraint::Length(1),
+        Constraint::Length(7),
+      ])
+      .areas(area);
 
       let file_details_title_paragraph =
         Paragraph::new("File Details".bold()).block(layout_block_top_border());

src/ui/radarr_ui/library/movie_details_ui_tests.rs

@@ -6,11 +6,11 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
+  use crate::ui::DrawUi;
   use crate::ui::radarr_ui::library::movie_details_ui::{
-    style_from_download_status, MovieDetailsUi,
+    MovieDetailsUi, style_from_download_status,
   };
   use crate::ui::styles::ManagarrStyle;
-  use crate::ui::DrawUi;
 
   #[test]
   fn test_movie_details_ui_accepts() {