tidyup

src/error.rs

@@ -27,6 +27,7 @@ pub enum Error {
     Dialogue,
     Ending,
     Exit,
+    Font,
     Game {
         missing: NotFound,
     },

src/game.rs

@@ -255,7 +255,7 @@ impl Game {
         }
 
         if ! avatar_exists {
-            warnings.push(crate::Error::Game { missing: NotFound::Avatar});
+            warnings.push(crate::Error::Game { missing: NotFound::Avatar });
         }
 
         Ok(

src/sprite.rs

@@ -51,9 +51,7 @@ impl Sprite {
             format!("\n{}", lines.join("\n"))
         }
     }
-}
     
-impl Sprite {
     pub fn from_str(str: &str) -> Result<Sprite, crate::Error> {
         let mut lines: Vec<&str> = str.lines().collect();
 

src/text.rs

@@ -13,19 +13,19 @@ impl Font {
         match str {
             "unicode_european_small" => Font::UnicodeEuropeanSmall,
             "unicode_european_large" => Font::UnicodeEuropeanLarge,
-            "unicode_asian" => Font::UnicodeAsian,
-            "arabic" => Font::Arabic,
-            _ => Font::Custom,
+            "unicode_asian"          => Font::UnicodeAsian,
+            "arabic"                 => Font::Arabic,
+            _                        => Font::Custom,
         }
     }
 
-    pub(crate) fn to_string(&self) -> Result<String, &'static str> {
+    pub(crate) fn to_string(&self) -> Result<String, crate::Error> {
         match &self {
             Font::UnicodeEuropeanSmall => Ok("unicode_european_small".to_string()),
             Font::UnicodeEuropeanLarge => Ok("unicode_european_large".to_string()),
-            Font::UnicodeAsian => Ok("unicode_asian".to_string()),
-            Font::Arabic => Ok("arabic".to_string()),
-            _ => Err("No string available for this Font"),
+            Font::UnicodeAsian         => Ok("unicode_asian".to_string()),
+            Font::Arabic               => Ok("arabic".to_string()),
+            _                          => Err(crate::Error::Font),
         }
     }
 }