🔀 Merge pull request #103 from rster2002/codex-entry-reexports

Fix missing reexports for guardian codex entries
rster2002 · Nov 16, 2024 · bf25441 · bf25441
2 parents 114762e + fd5a945
commit bf25441
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/modules/exploration/mod.rs b/src/modules/exploration/mod.rs
@@ -5,6 +5,8 @@ pub use models::codex_entry::CodexEntry;
 pub use models::codex_entry::CodexEntryError;
 pub use models::codex_geological_entry::CodexGeologicalEntry;
 pub use models::codex_geological_entry::CodexGeologicalError;
+pub use models::codex_guardian_entry::CodexGuardianEntry;
+pub use models::codex_guardian_entry::CodexGuardianError;
 pub use models::codex_organic_structure_entry::CodexOrganicStructureEntry;
 pub use models::codex_organic_structure_entry::CodexOrganicStructureError;
 pub use models::codex_planet_entry::CodexPlanetEntry;

diff --git a/src/modules/exploration/models/codex_guardian_entry.rs b/src/modules/exploration/models/codex_guardian_entry.rs
@@ -39,7 +39,7 @@ impl CodexGuardianEntry {
 }
 
 #[derive(Debug, Error)]
-pub enum CodexGuardianEntryError {
+pub enum CodexGuardianError {
     #[error("Failed to parse guardian codex entry: '{0}'")]
     FailedToParse(String),
 
@@ -48,11 +48,11 @@ pub enum CodexGuardianEntryError {
 }
 
 impl FromStr for CodexGuardianEntry {
-    type Err = CodexGuardianEntryError;
+    type Err = CodexGuardianError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let Some(captures) = CODEX_REGEX.captures(s) else {
-            return Err(CodexGuardianEntryError::FailedToParse(s.to_string()));
+            return Err(CodexGuardianError::FailedToParse(s.to_string()));
         };
 
         let string: &str = &captures
@@ -83,7 +83,7 @@ impl FromStr for CodexGuardianEntry {
             _ => CodexGuardianEntry::Unknown(string.to_string()),
 
             #[cfg(not(feature = "allow-unknown"))]
-            _ => return Err(CodexGuardianEntryError::UnknownEntry(string.to_string())),
+            _ => return Err(CodexGuardianError::UnknownEntry(string.to_string())),
         })
     }
 }