replace macros with more general methods

1 files changed, 33 insertions, 3 deletions

diff --git a/src/main.rs b/src/main.rs
index 68b8c9e..133bdf4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,11 +2,41 @@
 extern crate quicli;
 extern crate ansi_term;
 
-use ansi_term::Color::Yellow;
+use ansi_term::Color::{Green, Red, Yellow};
 use quicli::prelude::*;
+use std::fmt::Display;
+
+pub fn verify<T: PartialEq + Display>(left: T, right: T) {
+    if left == right {
+        println!("{} {} == {}", Green.bold().paint("PASS"), left, right);
+    } else {
+        println!(
+            "{} You submitted {}, but that's not correct!",
+            Red.bold().paint("FAIL"),
+            left
+        );
+        println!("     Please correct your code to make this test pass!");
+    }
+}
+
+pub fn verify_easy<T: PartialEq + Display>(left: T, right: T) {
+    if left == right {
+        println!("{} {} == {}", Green.bold().paint("PASS"), left, right);
+    } else {
+        println!(
+            "{} You submitted {}, but that's not correct!",
+            Red.bold().paint("FAIL"),
+            left
+        );
+        println!("     Expected: {}", right);
+        println!("     Please correct your code to make this test pass!");
+    }
+}
+
+pub fn title(s: &str) {
+    println!("{} {}", Yellow.bold().paint("RUN"), s);
+}
 
-#[macro_use]
-mod macros;
 mod about_variables;
 
 #[derive(Debug, StructOpt)]