♻️ Run cargo clippy fix and fmt

ed-journals/src/lib.rs

@@ -11,30 +11,30 @@
 //! and `Status.json` etc will be added in the future. Best place to get started is the [JournalDir]
 //! model.
 
-mod models;
 mod macros;
+mod models;
 
 pub use models::journal_dir::JournalDir;
-pub use models::journal_file::JournalFile;
 pub use models::journal_event::JournalEvent;
-pub use models::journal_reader::JournalReader;
 pub use models::journal_event_content::JournalEventContent;
 pub use models::journal_event_content::JournalEventContentKind;
+pub use models::journal_file::JournalFile;
+pub use models::journal_reader::JournalReader;
 
 pub use models::journal_event_content;
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
+
     use crate::models::journal_dir::JournalDir;
-    use std::env::current_dir;
-    use crate::models::journal_event_content::JournalEventContent;
     use crate::models::journal_event_content::scan_event::ScanEventKind;
-    use crate::models::journal_event_content::shared::galaxy::atmosphere_type::AtmosphereType;
+    use crate::models::journal_event_content::JournalEventContent;
+    use std::env::current_dir;
 
     #[test]
     fn sandbox() {
-        let dir_path = current_dir().unwrap()
+        let dir_path = current_dir()
+            .unwrap()
             .parent()
             .unwrap()
             .join("test-journals");
@@ -67,8 +67,8 @@ mod tests {
                             }
                             ScanEventKind::BeltCluster(_) => {}
                         }
-                    },
-                    _ => {},
+                    }
+                    _ => {}
                 }
             }
         }

ed-journals/src/models.rs

@@ -1,5 +1,3 @@
-use crate::JournalFile;
-
 pub mod journal_dir;
 pub mod journal_event;
 

ed-journals/src/models/journal_dir.rs

@@ -72,21 +72,20 @@ impl JournalDir {
 
 #[cfg(test)]
 mod tests {
-    use std::env::current_dir;
     use crate::JournalDir;
+    use std::env::current_dir;
 
     #[test]
     fn journal_files_oldest_first_are_returned_in_the_correct_order() {
-        let dir_path = current_dir().unwrap()
+        let dir_path = current_dir()
+            .unwrap()
             .parent()
             .unwrap()
             .join("test-journals");
 
         let journal_dir = JournalDir::try_from(dir_path).unwrap();
 
-        let mut journal_files = journal_dir.journal_logs_oldest_first()
-            .unwrap()
-            .into_iter();
+        let mut journal_files = journal_dir.journal_logs_oldest_first().unwrap().into_iter();
 
         let journal_1 = journal_files.next().unwrap();
         let journal_2 = journal_files.next().unwrap();
@@ -99,16 +98,15 @@ mod tests {
 
     #[test]
     fn journal_files_newest_first_are_returned_in_the_correct_order() {
-        let dir_path = current_dir().unwrap()
+        let dir_path = current_dir()
+            .unwrap()
             .parent()
             .unwrap()
             .join("test-journals");
 
         let journal_dir = JournalDir::try_from(dir_path).unwrap();
 
-        let mut journal_files = journal_dir.journal_logs_newest_first()
-            .unwrap()
-            .into_iter();
+        let mut journal_files = journal_dir.journal_logs_newest_first().unwrap().into_iter();
 
         let journal_1 = journal_files.next().unwrap();
         let journal_2 = journal_files.next().unwrap();

ed-journals/src/models/journal_event.rs

@@ -1,7 +1,6 @@
 use crate::models::journal_event_content::JournalEventContent;
 use chrono::{DateTime, Utc};
 use serde::Deserialize;
-use crate::models::journal_file::JournalFile;
 
 /// An entry from a [JournalFile]. Most of the content can be found in the [JournalEventContent].
 #[derive(Debug, Deserialize, Clone, PartialEq)]

ed-journals/src/models/journal_event_content.rs

@@ -128,6 +128,20 @@ pub mod sell_organic_data;
 pub mod send_text_event;
 pub mod set_user_ship_name_event;
 
+mod book_taxi_event;
+mod carrier_buy_event;
+mod carrier_crew_services_event;
+mod carrier_finance_event;
+mod crew_hire_event;
+mod engineer_contribution_event;
+mod faction_kill_bond_event;
+mod fs_embark_event;
+mod interdiction_event;
+mod module_buy_and_store_event;
+mod module_sell_remote_event;
+mod powerplay_leave_event;
+mod powerplay_salary_event;
+mod search_and_rescue_event;
 /// Contains structs and enums which are shared across events. Things like commodity and material
 /// names, ship types, exobiology data etc. can be found here.
 pub mod shared;
@@ -140,6 +154,7 @@ pub mod shipyard_new_event;
 pub mod shipyard_swap_event;
 pub mod shipyard_transfer_event;
 pub mod squadron_startup_event;
+mod srv_destroyed_event;
 pub mod start_jump_event;
 pub mod statistics_event;
 pub mod stored_modules_event;
@@ -157,33 +172,18 @@ pub mod undocked_event;
 pub mod use_consumable_event;
 pub mod uss_drop_event;
 pub mod vehicle_switch_event;
-mod faction_kill_bond_event;
-mod book_taxi_event;
-mod interdiction_event;
-mod module_buy_and_store_event;
-mod carrier_crew_services_event;
-mod engineer_contribution_event;
-mod srv_destroyed_event;
-mod module_sell_remote_event;
-mod powerplay_leave_event;
-mod wing_invite_event;
 mod wing_add_event;
+mod wing_invite_event;
 mod wing_join_event;
-mod powerplay_salary_event;
-mod carrier_buy_event;
-mod fs_embark_event;
-mod carrier_finance_event;
-mod search_and_rescue_event;
-mod crew_hire_event;
 
-use kinded::Kinded;
 use crate::models::journal_event_content::afmu_repairs_event::AFMURepairsEvent;
 use crate::models::journal_event_content::applied_to_squadron_event::AppliedToSquadronEvent;
 use crate::models::journal_event_content::approach_body_event::ApproachBodyEvent;
 use crate::models::journal_event_content::approach_settlement_event::ApproachSettlementEvent;
 use crate::models::journal_event_content::asteroid_cracked_event::AsteroidCrackedEvent;
 use crate::models::journal_event_content::backpack_change_event::BackpackChangeEvent;
 use crate::models::journal_event_content::backpack_event::BackpackEvent;
+use crate::models::journal_event_content::book_taxi_event::BookTaxiEvent;
 use crate::models::journal_event_content::bounty_event::BountyEvent;
 use crate::models::journal_event_content::buy_ammo_event::BuyAmmoEvent;
 use crate::models::journal_event_content::buy_drones_event::BuyDronesEvent;
@@ -195,7 +195,10 @@ use crate::models::journal_event_content::cargo_depot_event::CargoDepotEvent;
 use crate::models::journal_event_content::cargo_event::CargoEvent;
 use crate::models::journal_event_content::cargo_transfer_event::CargoTransferEvent;
 use crate::models::journal_event_content::carrier_bank_transfer_event::CarrierBankTransferEvent;
+use crate::models::journal_event_content::carrier_buy_event::CarrierBuyEvent;
+use crate::models::journal_event_content::carrier_crew_services_event::CarrierCrewServicesEvent;
 use crate::models::journal_event_content::carrier_deposit_fuel_event::CarrierDepositFuelEvent;
+use crate::models::journal_event_content::carrier_finance_event::CarrierFinanceEvent;
 use crate::models::journal_event_content::carrier_jump_cancelled_event::CarrierJumpCancelled;
 use crate::models::journal_event_content::carrier_jump_event::CarrierJumpEvent;
 use crate::models::journal_event_content::carrier_jump_request_event::CarrierJumpRequestEvent;
@@ -208,6 +211,7 @@ use crate::models::journal_event_content::commander_event::CommanderEvent;
 use crate::models::journal_event_content::commit_crime_event::CommitCrimeEvent;
 use crate::models::journal_event_content::create_suit_loadout_event::CreateSuitLoadoutEvent;
 use crate::models::journal_event_content::crew_assign_event::CrewAssignEvent;
+use crate::models::journal_event_content::crew_hire_event::CrewHireEvent;
 use crate::models::journal_event_content::crime_victim_event::CrimeVictimEvent;
 use crate::models::journal_event_content::data_scanned_event::DataScannedEvent;
 use crate::models::journal_event_content::datalink_scan_event::DatalinkScanEvent;
@@ -225,14 +229,17 @@ use crate::models::journal_event_content::docking_timeout_event::DockingTimeoutE
 use crate::models::journal_event_content::drop_items_event::DropItemsEvent;
 use crate::models::journal_event_content::eject_cargo_event::EjectCargoEvent;
 use crate::models::journal_event_content::embark_event::EmbarkEvent;
+use crate::models::journal_event_content::engineer_contribution_event::EngineerContributionEvent;
 use crate::models::journal_event_content::engineer_craft_event::EngineerCraftEvent;
 use crate::models::journal_event_content::engineer_progress_event::EngineerProgressEvent;
 use crate::models::journal_event_content::escape_interdiction_event::EscapeInterdictionEvent;
+use crate::models::journal_event_content::faction_kill_bond_event::FactionKillBondEvent;
 use crate::models::journal_event_content::fetch_remote_module_event::FetchRemoteModuleEvent;
 use crate::models::journal_event_content::fighter_destroyed_event::FighterDestroyedEvent;
 use crate::models::journal_event_content::fighter_rebuilt_event::FighterRebuiltEvent;
 use crate::models::journal_event_content::file_header_event::FileHeaderEvent;
 use crate::models::journal_event_content::friends_event::FriendsEvent;
+use crate::models::journal_event_content::fs_embark_event::FCMaterialsEvent;
 use crate::models::journal_event_content::fsd_jump_event::FSDJumpEvent;
 use crate::models::journal_event_content::fsd_target_event::FSDTargetEvent;
 use crate::models::journal_event_content::fss_all_bodies_found_event::FSSAllBodiesFoundEvent;
@@ -242,6 +249,7 @@ use crate::models::journal_event_content::fss_signal_discovered_event::FSSSignal
 use crate::models::journal_event_content::fuel_scoop_event::FuelScoopEvent;
 use crate::models::journal_event_content::hull_damage_event::HullDamageEvent;
 use crate::models::journal_event_content::interdicted_event::InterdictedEvent;
+use crate::models::journal_event_content::interdiction_event::InterdictionEvent;
 use crate::models::journal_event_content::jet_cone_boost_event::JetConeBoostEvent;
 use crate::models::journal_event_content::launch_drone_event::LaunchDroneEvent;
 use crate::models::journal_event_content::launch_fighter_event::LaunchFighterEvent;
@@ -266,9 +274,11 @@ use crate::models::journal_event_content::mission_completed_event::MissionComple
 use crate::models::journal_event_content::mission_failed_event::MissionFailedEvent;
 use crate::models::journal_event_content::mission_redirected_event::MissionRedirectedEvent;
 use crate::models::journal_event_content::missions_event::MissionsEvent;
+use crate::models::journal_event_content::module_buy_and_store_event::ModuleBuyAndStoreEvent;
 use crate::models::journal_event_content::module_buy_event::ModuleBuyEvent;
 use crate::models::journal_event_content::module_retrieve_event::ModuleRetrieveEvent;
 use crate::models::journal_event_content::module_sell_event::ModuleSellEvent;
+use crate::models::journal_event_content::module_sell_remote_event::ModuleSellRemoteEvent;
 use crate::models::journal_event_content::module_store_event::ModuleStoreEvent;
 use crate::models::journal_event_content::module_swap_event::ModuleSwapEvent;
 use crate::models::journal_event_content::multi_sell_exploration_data_event::MultiSellExplorationDataEvent;
@@ -282,6 +292,8 @@ use crate::models::journal_event_content::passengers_event::PassengersEvent;
 use crate::models::journal_event_content::pay_bounties_event::PayBountiesEvent;
 use crate::models::journal_event_content::pay_fines_event::PayFinesEvent;
 use crate::models::journal_event_content::powerplay_event::PowerplayEvent;
+use crate::models::journal_event_content::powerplay_leave_event::PowerplayLeaveEvent;
+use crate::models::journal_event_content::powerplay_salary_event::PowerplaySalaryEvent;
 use crate::models::journal_event_content::progress_event::ProgressEvent;
 use crate::models::journal_event_content::promotion_event::PromotionEvent;
 use crate::models::journal_event_content::prospected_asteroid_event::ProspectedAsteroidEvent;
@@ -302,6 +314,7 @@ use crate::models::journal_event_content::scan_bary_centre_event::ScanBaryCentre
 use crate::models::journal_event_content::scan_event::ScanEvent;
 use crate::models::journal_event_content::scan_organic_event::ScanOrganicEvent;
 use crate::models::journal_event_content::scanned_event::ScannedEvent;
+use crate::models::journal_event_content::search_and_rescue_event::SearchAndRescueEvent;
 use crate::models::journal_event_content::sell_drones_event::SellDronesEvent;
 use crate::models::journal_event_content::sell_organic_data::SellOrganicDataEvent;
 use crate::models::journal_event_content::send_text_event::SendTextEvent;
@@ -315,6 +328,7 @@ use crate::models::journal_event_content::shipyard_new_event::ShipyardNewEvent;
 use crate::models::journal_event_content::shipyard_swap_event::ShipyardSwapEvent;
 use crate::models::journal_event_content::shipyard_transfer_event::ShipyardTransferEvent;
 use crate::models::journal_event_content::squadron_startup_event::SquadronStartupEvent;
+use crate::models::journal_event_content::srv_destroyed_event::SRVDestroyedEvent;
 use crate::models::journal_event_content::start_jump_event::StartJumpEvent;
 use crate::models::journal_event_content::statistics_event::StatisticsEvent;
 use crate::models::journal_event_content::stored_modules_event::StoredModulesEvent;
@@ -332,28 +346,12 @@ use crate::models::journal_event_content::undocked_event::UndockedEvent;
 use crate::models::journal_event_content::use_consumable_event::UseConsumableEvent;
 use crate::models::journal_event_content::uss_drop_event::USSDropEvent;
 use crate::models::journal_event_content::vehicle_switch_event::VehicleSwitchEvent;
-use serde::Deserialize;
-use serde_json::Value;
-use crate::models::journal_event_content::book_taxi_event::BookTaxiEvent;
-use crate::models::journal_event_content::carrier_buy_event::CarrierBuyEvent;
-use crate::models::journal_event_content::carrier_crew_services_event::CarrierCrewServicesEvent;
-use crate::models::journal_event_content::carrier_finance_event::CarrierFinanceEvent;
-use crate::models::journal_event_content::crew_hire_event::CrewHireEvent;
-use crate::models::journal_event_content::engineer_contribution_event::EngineerContributionEvent;
-use crate::models::journal_event_content::faction_kill_bond_event::FactionKillBondEvent;
-use crate::models::journal_event_content::fs_embark_event::FCMaterialsEvent;
-use crate::models::journal_event_content::interdiction_event::InterdictionEvent;
-use crate::models::journal_event_content::module_buy_and_store_event::ModuleBuyAndStoreEvent;
-use crate::models::journal_event_content::module_sell_remote_event::ModuleSellRemoteEvent;
-use crate::models::journal_event_content::powerplay_leave_event::PowerplayLeaveEvent;
-use crate::models::journal_event_content::powerplay_salary_event::PowerplaySalaryEvent;
-use crate::models::journal_event_content::search_and_rescue_event::SearchAndRescueEvent;
-use crate::models::journal_event_content::srv_destroyed_event::SRVDestroyedEvent;
 use crate::models::journal_event_content::wing_add_event::WingAddEvent;
 use crate::models::journal_event_content::wing_invite_event::WingInviteEvent;
 use crate::models::journal_event_content::wing_join_event::WingJoinEvent;
-
-use crate::models::journal_file::JournalFile;
+use kinded::Kinded;
+use serde::Deserialize;
+use serde_json::Value;
 
 /// Enum containing all the possible events that can be found in a [JournalFile].
 ///

ed-journals/src/models/journal_event_content/codex_entry_event.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::exploration::codex_entry::CodexEntry;
 use crate::models::journal_event_content::shared::galaxy::region::Region;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/create_suit_loadout_event.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::odyssey::suit::Suit;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/crew_hire_event.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::commander::combat_rank::CombatRank;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/dock_srv_event.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::ship::srv_type::SRVType;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/engineer_contribution_event.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::materials::material::Material;
 use crate::models::journal_event_content::shared::trading::commodity::Commodity;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/interdiction_event.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::commander::combat_rank::CombatRank;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/launch_srv_event.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::ship::srv_type::SRVType;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/module_buy_and_store_event.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::ship::ship_module::ShipModule;
 use crate::models::journal_event_content::shared::ship::ship_type::ShipType;
+use serde::Deserialize;
 
 /// When buying a module but storing at the current location instead of equipping it to the current
 /// ship.

ed-journals/src/models/journal_event_content/module_retrieve_event.rs

@@ -1,7 +1,7 @@
-use crate::models::journal_event_content::shared::ship::ship_type::ShipType;
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::ship::ship_module::ShipModule;
 use crate::models::journal_event_content::shared::ship::ship_slot::ShipSlot;
+use crate::models::journal_event_content::shared::ship::ship_type::ShipType;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/module_sell_remote_event.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
 use crate::models::journal_event_content::shared::ship::ship_module::ShipModule;
 use crate::models::journal_event_content::shared::ship::ship_type::ShipType;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

ed-journals/src/models/journal_event_content/module_store_event.rs

@@ -1,7 +1,7 @@
 use crate::models::journal_event_content::shared::ship::ship_module::ShipModule;
+use crate::models::journal_event_content::shared::ship::ship_slot::ShipSlot;
 use crate::models::journal_event_content::shared::ship::ship_type::ShipType;
 use serde::Deserialize;
-use crate::models::journal_event_content::shared::ship::ship_slot::ShipSlot;
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]