Warning fixes (#54)

* More warning fixes

* Should be the last of the warning fixes

* Code cleanup

* Code formatting

src/models/api.rs

@@ -2,19 +2,9 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct API {
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Api {
     pub url: String,
     pub endpoint: String,
     pub version: String,
 }
-
-impl Default for API {
-    fn default() -> Self {
-        API {
-            url: String::new(),
-            endpoint: String::new(),
-            version: String::new(),
-        }
-    }
-}

src/models/flags.rs

@@ -2,17 +2,8 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Flags {
     pub flag: String,
     pub value: String,
 }
-
-impl Default for Flags {
-    fn default() -> Self {
-        Flags {
-            flag: String::new(),
-            value: String::new(),
-        }
-    }
-}

src/models/icarus_action.rs

@@ -4,21 +4,12 @@ use serde::{Deserialize, Serialize};
 
 use crate::models;
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct IcarusAction {
     pub action: String,
     pub flags: Vec<models::flags::Flags>,
 }
 
-impl Default for IcarusAction {
-    fn default() -> Self {
-        IcarusAction {
-            action: String::new(),
-            flags: Vec::new(),
-        }
-    }
-}
-
 impl IcarusAction {
     pub fn retrieve_flag_value(&self, flag: &String) -> String {
         let mut val: String = String::new();
@@ -30,7 +21,7 @@ impl IcarusAction {
             }
         }
 
-        return val;
+        val
     }
 
     pub fn print_action_and_flags(&self) {

src/models/upload_form.rs

@@ -2,17 +2,8 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize)]
 pub struct UploadForm {
     pub url: Option<String>,
     pub filepath: Option<String>,
 }
-
-impl Default for UploadForm {
-    fn default() -> Self {
-        UploadForm {
-            url: None,
-            filepath: None,
-        }
-    }
-}