🐛 Fix some missing re-exports

rster2002 · Jan 31, 2025 · 1e8d612 · 1e8d612
1 parent f37bae5
commit 1e8d612
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git a/src/modules/civilization/mod.rs b/src/modules/civilization/mod.rs
@@ -1,4 +1,5 @@
 pub use models::conflict::Conflict;
+pub use models::conflict::ConflictStatus;
 pub use models::conflict::ConflictFaction;
 pub use models::conflict::ConflictWarType;
 pub use models::crime::Crime;

diff --git a/src/modules/logs/content/log_event_content.rs b/src/modules/logs/content/log_event_content.rs
@@ -250,10 +250,10 @@ use crate::logs::content::log_event_content::start_jump_event::StartJumpType;
 use crate::modules::partials::PartialSystemInfo;
 
 #[cfg(feature = "legacy")]
-use crate::logs::content::log_event_content::legacy_liftoff_event::LegacyLiftoffEvent;
+use legacy_liftoff_event::LegacyLiftoffEvent;
 
 #[cfg(feature = "legacy")]
-use crate::logs::content::log_event_content::legacy_touchdown_event::LegacyTouchdownEvent;
+use legacy_touchdown_event::LegacyTouchdownEvent;
 
 pub mod afmu_repairs_event;
 pub mod applied_to_squadron_event;
@@ -499,9 +499,11 @@ pub mod wing_join_event;
 pub mod won_a_trophy_for_squadron_event;
 
 #[cfg(feature = "legacy")]
+#[cfg_attr(docsrs, doc(cfg(feature = "legacy")))]
 pub mod legacy_liftoff_event;
 
 #[cfg(feature = "legacy")]
+#[cfg_attr(docsrs, doc(cfg(feature = "legacy")))]
 pub mod legacy_touchdown_event;
 
 /// Enum containing all the possible events that can be found in a [JournalFile].
@@ -803,10 +805,12 @@ pub enum LogEventContent {
 
     // Legacy
     #[cfg(feature = "legacy")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "legacy")))]
     #[serde(untagged)]
     LegacyLiftoffEvent(LegacyLiftoffEvent),
 
     #[cfg(feature = "legacy")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "legacy")))]
     #[serde(untagged)]
     LegacyTouchdownEvent(LegacyTouchdownEvent),
 

diff --git a/src/modules/ship/mod.rs b/src/modules/ship/mod.rs
@@ -2,11 +2,11 @@
 //! the different modules that can be equipped.
 //!
 //! You usually want to use one of the top-level models like:
-//! * [ShipType] for parsing which type of ship is being used.
-//! * [ShipModule] for parsing any kind of ship module, including optional- and core internals,
+//! * [ShipType](crate::ship::ShipType) for parsing which type of ship is being used.
+//! * [ShipModule](crate::ship::ShipModule) for parsing any kind of ship module, including optional- and core internals,
 //!   full-sized hardpoints and utility modules, hulls and cosmetics and some internal modules which
 //!   are not modules which can be outfitted, but they may appear in some of the journal logs.
-//! * [FighterType] and [SRVType] are small enums to specify their respective variants.
+//! * [FighterType](crate::ship::FighterType) and [SRVType](crate::ship::SRVType) are small enums to specify their respective variants.
 
 pub use models::blueprint::Blueprint;
 pub use models::blueprint_modifier::BlueprintModifier;
@@ -18,6 +18,16 @@ pub use models::ship_module::ship_cockpit_module::ShipCockpitModule;
 pub use models::ship_module::ship_cockpit_module::ShipCockpitModuleError;
 pub use models::ship_module::ship_decal::ShipDecal;
 pub use models::ship_module::ship_decal::ShipDecalError;
+pub use models::ship_module::ship_engine_color::ShipEngineColor;
+pub use models::ship_module::ship_engine_color::ShipEngineColorError;
+pub use models::ship_module::ship_weapon_color::ShipWeaponColor;
+pub use models::ship_module::ship_weapon_color::ShipWeaponColorError;
+pub use models::ship_module::ship_kit_module::ShipKitModule;
+pub use models::ship_module::ship_kit_module::ShipKitModuleError;
+pub use models::ship_module::ship_bobble::ShipBobble;
+pub use models::ship_module::ship_bobble::ShipBobbleError;
+pub use models::ship_module::ship_string_lights::ShipStringLights;
+pub use models::ship_module::ship_string_lights::ShipStringLightsError;
 pub use models::ship_module::ship_hardpoint_module::hardpoint_module::HardpointModule;
 pub use models::ship_module::ship_hardpoint_module::hardpoint_mounting::HardpointMounting;
 pub use models::ship_module::ship_hardpoint_module::hardpoint_size::HardpointSize;
@@ -43,6 +53,7 @@ pub use models::ship_module::ShipModule;
 pub use models::ship_slot::ShipSlot;
 pub use models::ship_slot::ShipSlotError;
 pub use models::ship_slot::ShipSlotKind;
+pub use models::ship_slot::core_slot::CoreSlot;
 pub use models::ship_type::ShipType;
 pub use models::ship_type::ShipTypeError;
 pub use models::srv_type::SRVType;

diff --git a/src/modules/ship/models/ship_module/ship_engine_color.rs b/src/modules/ship/models/ship_module/ship_engine_color.rs
@@ -9,7 +9,7 @@ use crate::from_str_deserialize_impl;
 
 #[derive(Debug, Serialize, Clone, PartialEq)]
 pub struct ShipEngineColor {
-    name: String,
+    pub name: String,
 }
 
 #[derive(Debug, Error)]

diff --git a/src/modules/ship/models/ship_module/ship_string_lights.rs b/src/modules/ship/models/ship_module/ship_string_lights.rs
@@ -9,7 +9,7 @@ use crate::from_str_deserialize_impl;
 
 #[derive(Debug, Serialize, Clone, PartialEq)]
 pub struct ShipStringLights {
-    name: String,
+    pub name: String,
 }
 
 #[derive(Debug, Error)]

diff --git a/src/modules/ship/models/ship_module/ship_weapon_color.rs b/src/modules/ship/models/ship_module/ship_weapon_color.rs
@@ -9,7 +9,7 @@ use crate::from_str_deserialize_impl;
 
 #[derive(Debug, Serialize, Clone, PartialEq)]
 pub struct ShipWeaponColor {
-    name: String,
+    pub name: String,
 }
 
 #[derive(Debug, Error)]

diff --git a/src/modules/ship/models/ship_slot.rs b/src/modules/ship/models/ship_slot.rs
@@ -11,7 +11,7 @@ use crate::from_str_deserialize_impl;
 use crate::modules::ship::models::ship_slot::core_slot::CoreSlot;
 use crate::modules::ship::{HardpointSize, HardpointSizeError};
 
-mod core_slot;
+pub mod core_slot;
 
 #[derive(Debug, Serialize, Clone, PartialEq)]
 pub struct ShipSlot {