X-Git-Url: https://harishankar.org/repos/?p=evpf.git;a=blobdiff_plain;f=src%2Fmain.rs;h=98532ff4f10a7fdc12d5668af895c7ad083e863c;hp=2154ba56b87f1926be18214671d33833f0652a84;hb=a550442ff655e75c85edc1d0d591c34a1cc4380c;hpb=ebba3951aa13d2668bc684680f557b8cbbda8b20

diff --git a/src/main.rs b/src/main.rs
index 2154ba5..98532ff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,7 @@
 use std::io;
 use std::io::Write;
 use regex::Regex;
-use ansi_term::Colour;
-use ansi_term::Style;
+use colored::*;
 use std::env;
 
 const ILLEGAL_EXP : &'static str = "Illegal Expression";
@@ -159,12 +158,12 @@ fn main() {
 		if res.is_ok () {
 			let restxt = format! ("{}: {}", RESULT, 
 											res.unwrap());
-			println! ("{}", Colour::Green.paint (restxt));
+			println! ("{}", restxt.green ());
 		} else {
 		// print the error in purple
 			let errtxt = format! ("{}: {}", ERROR, 
 											res.unwrap_err());
-			eprintln! ("{}", Colour::Purple.paint (errtxt));
+			eprintln! ("{}", errtxt.purple ());
 		}		
 		
 	} else {
@@ -178,7 +177,7 @@ fn main() {
 		// loop until a blank line is received	
 		loop {
 			expr.clear ();	
-			print!("{}", Style::new().bold().paint("evpf>"));
+			print!("{}", "evpf>".bold() );
 			io::stdout().flush ().expect (ERR_FLUSHING);
 			// read a line of text
 			io::stdin().read_line (&mut expr).expect (ERR_READING_LINE);
@@ -191,7 +190,7 @@ fn main() {
 			} else if expr == "?" || expr == "h" || expr == "H" {
 			// display help text
 				for text in HELP_TEXT.iter() {
-					println! ("{}", Colour::Cyan.paint(*text));
+					println! ("{}", text.cyan() );
 				}
 
 				continue;
@@ -207,13 +206,13 @@ fn main() {
 			if res.is_ok () {
 				let restxt = format! ("{}: {}", RESULT, 
 												res.unwrap());
-				println! ("{}", Colour::Green.paint (restxt));
+				println! ("{}", restxt.green ());
 			} else {
 			// print the error in purple
 				let errtxt = format! ("{}: {}", ERROR, 
 												res.unwrap_err());
-				eprintln! ("{}", Colour::Purple.paint (errtxt));
-				eprintln! ("{}", Colour::Purple.paint (ERROR_HELP));
+				eprintln! ("{}", errtxt.purple());
+				eprintln! ("{}", ERROR_HELP.purple());
 			}
 		}
 	}