Merge pull request 'clap' (#1) from clap into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/1

1 files changed, 15 insertions, 14 deletions

diff --git a/src/lib.rs b/src/lib.rs
index eb845d8..43f0fe7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,36 +1,37 @@
 pub mod apis;
-pub mod config;
 pub mod commands;
-pub mod input;
+pub mod config;
 pub mod db;
 pub mod error;
 pub mod files;
 
-use std::path::Path;
+use std::{fmt::Display, path::Path};
 
 pub use apis::*;
 pub use commands::*;
-use error::{MLE, ErrorType, MLError};
+use error::{ErrorType, MLError, MLE};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Modloader {
     Fabric,
-    Forge
+    Forge,
 }
 
 impl Modloader {
-    fn to_string(&self) -> String {
-        match self {
-            Modloader::Fabric => String::from("fabric"),
-            Modloader::Forge => String::from("forge"),
-        }
-    }
-
-    fn from(string: &str) -> MLE<Modloader> {
+    pub fn from(string: &str) -> MLE<Modloader> {
         match string {
             "forge" => Ok(Modloader::Forge),
             "fabric" => Ok(Modloader::Fabric),
-            _ => Err(MLError::new(ErrorType::ArgumentError, "UNKNOWN_MODLOADER"))
+            _ => Err(MLError::new(ErrorType::ArgumentError, "UNKNOWN_MODLOADER")),
+        }
+    }
+}
+
+impl Display for Modloader {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Modloader::Fabric => write!(f, "fabric"),
+            Modloader::Forge => write!(f, "forge"),
         }
     }
 }