move output format to separate module

Author: Heliozoa

tmc-langs-cli/src/app.rs

@@ -1,3 +1,5 @@
+//! Create clap app
+
 use clap::{App, Arg, SubCommand};
 
 pub fn create_app() -> App<'static, 'static> {

tmc-langs-cli/src/main.rs

@@ -1,8 +1,12 @@
 //! CLI client for TMC
 
 mod app;
+mod output;
+
+use output::{Output, OutputResult, Status};
 
 use anyhow::{Context, Result};
+use clap::{Error, ErrorKind};
 use serde::Serialize;
 use std::collections::HashMap;
 use std::env;
@@ -20,36 +24,6 @@ use tmc_langs_util::{task_executor, Language};
 use url::Url;
 use walkdir::WalkDir;
 
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-enum Status {
-    Successful,
-    Crashed,
-    InProgress,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-enum OutputResult {
-    LoggedIn,
-    LoggedOut,
-    Error,
-    Running,
-    SentData,
-    ReceivedData,
-    ExecutedCommand,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-struct Output<T: Serialize> {
-    status: Status,
-    message: Option<String>,
-    result: OutputResult,
-    percent_done: f64,
-    data: Option<T>,
-}
-
 #[quit::main]
 fn main() {
     env_logger::init();
@@ -409,7 +383,7 @@ fn run() -> Result<()> {
                 let output = Output::<()> {
                     status: Status::Successful,
                     message: None,
-                    result: OutputResult::LoggedOut,
+                    result: OutputResult::NotLoggedIn,
                     percent_done: 1.0,
                     data: None,
                 };

tmc-langs-cli/src/output.rs

@@ -0,0 +1,34 @@
+//! Output format
+
+use serde::Serialize;
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Output<T: Serialize> {
+    pub status: Status,
+    pub message: Option<String>,
+    pub result: OutputResult,
+    pub percent_done: f64,
+    pub data: Option<T>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum Status {
+    Successful,
+    Crashed,
+    InProgress,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum OutputResult {
+    LoggedIn,
+    LoggedOut,
+    NotLoggedIn,
+    Error,
+    Running,
+    SentData,
+    ReceivedData,
+    ExecutedCommand,
+}