WIP

src/main.rs

@@ -39,8 +39,7 @@ fn welcome() {
 }
 
 fn ask_creds() -> Result<AccountType, AuthError> {
-    println!("Are you a teacher or a student");
-    let choice = input().inside(['t', 's']).get();
+    let choice = input().inside(['t', 's']).msg("Are you a teacher or a student ? t/s: ").get();
     let is_teacher = choice == 't';
 
     println!("Enter your username:");

src/models.rs

@@ -2,60 +2,49 @@ use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize)]
 pub struct Teacher {
-    pub(crate) creds: Credentials,
+    pub creds: Credentials,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct Student {
-    pub(crate) creds: Credentials,
+    pub creds: Credentials,
     pub grades: Vec<f32>,
 }
 
 #[derive(Serialize, Deserialize)]
-pub(crate) struct Credentials {
-    pub(crate) username: String,
-    pub(crate) password: String,
+pub struct Credentials {
+    pub username: String,
+    pub password: String,
 }
 
 pub trait User {
     fn get_username(&self) -> String;
     fn get_password(&self) -> String;
-    fn set_username(&mut self, username:&str);
-    fn set_password(&mut self, password:&str);
+    fn set_username(&mut self, username: &str);
+    fn set_password(&mut self, password: &str);
 }
 
-impl User for Teacher {
-    fn get_username(&self) -> String {
-        self.creds.username.clone()
-    }
+macro_rules! impl_user_trait {
+    ($a:ty)=>{
+        impl User for $a {
+            fn get_username(&self) -> String {
+                self.creds.username.clone()
+            }
 
-    fn get_password(&self) -> String {
-        self.creds.password.clone()
-    }
+            fn get_password(&self) -> String {
+                self.creds.password.clone()
+            }
 
-    fn set_username(&mut self, username: &str) {
-        self.creds.username = String::from(username);
-    }
+            fn set_username(&mut self, username: &str) {
+                self.creds.username = String::from(username);
+            }
 
-    fn set_password(&mut self, password: &str) {
-        self.creds.password = String::from(password);
+            fn set_password(&mut self, password: &str) {
+                self.creds.password = String::from(password);
+            }
+        }
     }
 }
 
-impl User for Student {
-    fn get_username(&self) -> String {
-        self.creds.username.clone()
-    }
-
-    fn get_password(&self) -> String {
-        self.creds.password.clone()
-    }
-
-    fn set_username(&mut self, username: &str) {
-        self.creds.username = String::from(username);
-    }
-
-    fn set_password(&mut self, password: &str) {
-        self.creds.password = String::from(password);
-    }
-}
+impl_user_trait!(Student);
+impl_user_trait!(Teacher);