summaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
authorolivia <olivia@fastmail.com>2018-05-14 19:13:13 +0200
committerolivia <olivia@fastmail.com>2018-05-14 19:13:13 +0200
commit8ea1b17fd9505da92a7233d8bfd6d5f1c3d9a93e (patch)
tree2d0c7112ea127dc9b593ac3ca22436d6ae23028c /src/main.rs
parent97efff760dcc032b634d3f69ebedac4ec1b301e7 (diff)
format
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/main.rs b/src/main.rs
index c3ca53c..3adc6bd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,12 @@
-#[macro_use] extern crate quicli;
+#[macro_use]
+extern crate quicli;
extern crate ansi_term;
+use ansi_term::Colour::{Green, Red, Yellow};
use quicli::prelude::*;
-use ansi_term::Colour::{Red, Yellow, Green};
macro_rules! verify {
- ( $str:expr, $left:expr, $right:expr ) => {
+ ($left:expr, $right:expr, $str:expr) => {
if ($left == $right) {
println!("{} {}", Green.bold().paint("PASS"), $str);
} else {
@@ -13,11 +14,11 @@ macro_rules! verify {
println!("\tYou submitted {}, but that's not correct!", $left);
println!("\tPlease correct your code to make this test pass!");
}
- }
+ };
}
macro_rules! verify_easy {
- ( $str:expr, $left:expr, $right:expr ) => {
+ ($str:expr, $left:expr, $right:expr) => {
if ($left == $right) {
println!("{} {}", Green.bold().paint("PASS"), $str);
} else {
@@ -26,7 +27,7 @@ macro_rules! verify_easy {
println!("\tGot: {}", $left);
println!("\tPlease correct your code to make this test pass!");
}
- }
+ };
}
mod about_variables;
@@ -36,11 +37,9 @@ struct Cli {
exercise: Option<String>,
}
-main!(|args: Cli| {
- if let Some(e) = args.exercise {
- println!("selected {}", e);
- } else {
- println!("Welcome to {}", Yellow.paint("rustlings"));
- verify!("One equals one", 1, 2);
- }
+main!(|args: Cli| if let Some(e) = args.exercise {
+ println!("selected {}", e);
+} else {
+ println!("Welcome to {}", Yellow.paint("rustlings"));
+ verify!(2, 1, "One equals one");
});