From 17ee0e3c7a47054baf5e66c5525541e4153c03b7 Mon Sep 17 00:00:00 2001
From: Luca Plian <98339220+AnonimAnonim2245@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:51:24 +0200
Subject: optimized the UI code (#1830)

---
 src/ui.rs | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'src/ui.rs')

diff --git a/src/ui.rs b/src/ui.rs
index 1ee4631..74835e1 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,33 +1,28 @@
-macro_rules! warn {
-    ($fmt:literal, $ex:expr) => {{
+macro_rules! print_emoji {
+    ($emoji:expr, $sign:expr, $color: ident ,$fmt:literal, $ex:expr) => {{
         use console::{style, Emoji};
         use std::env;
         let formatstr = format!($fmt, $ex);
         if env::var("NO_EMOJI").is_ok() {
-            println!("{} {}", style("!").red(), style(formatstr).red());
+            println!("{} {}", style($sign).$color(), style(formatstr).$color());
         } else {
             println!(
                 "{} {}",
-                style(Emoji("⚠️ ", "!")).red(),
-                style(formatstr).red()
+                style(Emoji($emoji, $sign)).$color(),
+                style(formatstr).$color()
             );
         }
     }};
 }
 
+macro_rules! warn {
+    ($fmt:literal, $ex:expr) => {{
+        print_emoji!("⚠️ ", "!", red, $fmt, $ex);
+    }};
+}
+
 macro_rules! success {
     ($fmt:literal, $ex:expr) => {{
-        use console::{style, Emoji};
-        use std::env;
-        let formatstr = format!($fmt, $ex);
-        if env::var("NO_EMOJI").is_ok() {
-            println!("{} {}", style("✓").green(), style(formatstr).green());
-        } else {
-            println!(
-                "{} {}",
-                style(Emoji("✅", "✓")).green(),
-                style(formatstr).green()
-            );
-        }
+        print_emoji!("✅ ", "✓", green, $fmt, $ex);
     }};
 }
-- 
cgit v1.2.3


From e276c1219279e14b267a36e99fb3908427bc67ff Mon Sep 17 00:00:00 2001
From: honeywest <honeywest@foxmail.com>
Date: Thu, 21 Mar 2024 15:18:50 +0800
Subject: feat: ui format

---
 src/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui.rs')

diff --git a/src/ui.rs b/src/ui.rs
index 74835e1..d8177b9 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,5 +1,5 @@
 macro_rules! print_emoji {
-    ($emoji:expr, $sign:expr, $color: ident ,$fmt:literal, $ex:expr) => {{
+    ($emoji:expr, $sign:expr, $color: ident, $fmt:literal, $ex:expr) => {{
         use console::{style, Emoji};
         use std::env;
         let formatstr = format!($fmt, $ex);
-- 
cgit v1.2.3


From 8ad18de54cdad2e94d40d7d4cb67e4a6a274c293 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Sun, 31 Mar 2024 20:11:08 +0200
Subject: Use var_os to avoid conversion to String

---
 src/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui.rs')

diff --git a/src/ui.rs b/src/ui.rs
index d8177b9..22d60d9 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -3,7 +3,7 @@ macro_rules! print_emoji {
         use console::{style, Emoji};
         use std::env;
         let formatstr = format!($fmt, $ex);
-        if env::var("NO_EMOJI").is_ok() {
+        if env::var_os("NO_EMOJI").is_some() {
             println!("{} {}", style($sign).$color(), style(formatstr).$color());
         } else {
             println!(
-- 
cgit v1.2.3


From 157fe016e5f335e04b4dd322623d35a244faa2ab Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Fri, 5 Apr 2024 00:49:22 +0200
Subject: Remove ui.rs

---
 src/main.rs   |  3 ---
 src/run.rs    |  3 ++-
 src/ui.rs     | 28 ----------------------------
 src/verify.rs |  7 ++++---
 4 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 src/ui.rs

(limited to 'src/ui.rs')

diff --git a/src/main.rs b/src/main.rs
index 20ec290..c62837d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,9 +17,6 @@ use std::time::Duration;
 use std::{io, thread};
 use verify::VerifyState;
 
-#[macro_use]
-mod ui;
-
 mod embedded;
 mod exercise;
 mod init;
diff --git a/src/run.rs b/src/run.rs
index ee2d3b4..38f4e0e 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -21,7 +21,8 @@ pub fn run(exercise: &Exercise) -> Result<()> {
         bail!("Ran {exercise} with errors");
     }
 
-    success!("Successfully ran {}", exercise);
+    // TODO: Color
+    println!("Successfully ran {exercise}");
 
     Ok(())
 }
diff --git a/src/ui.rs b/src/ui.rs
deleted file mode 100644
index 22d60d9..0000000
--- a/src/ui.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-macro_rules! print_emoji {
-    ($emoji:expr, $sign:expr, $color: ident, $fmt:literal, $ex:expr) => {{
-        use console::{style, Emoji};
-        use std::env;
-        let formatstr = format!($fmt, $ex);
-        if env::var_os("NO_EMOJI").is_some() {
-            println!("{} {}", style($sign).$color(), style(formatstr).$color());
-        } else {
-            println!(
-                "{} {}",
-                style(Emoji($emoji, $sign)).$color(),
-                style(formatstr).$color()
-            );
-        }
-    }};
-}
-
-macro_rules! warn {
-    ($fmt:literal, $ex:expr) => {{
-        print_emoji!("⚠️ ", "!", red, $fmt, $ex);
-    }};
-}
-
-macro_rules! success {
-    ($fmt:literal, $ex:expr) => {{
-        print_emoji!("✅ ", "✓", green, $fmt, $ex);
-    }};
-}
diff --git a/src/verify.rs b/src/verify.rs
index 5b05394..5beb206 100644
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -39,10 +39,11 @@ pub fn verify<'a>(
         }
 
         println!();
+        // TODO: Color
         match exercise.mode {
-            Mode::Compile => success!("Successfully ran {}!", exercise),
-            Mode::Test => success!("Successfully tested {}!", exercise),
-            Mode::Clippy => success!("Successfully checked {}!", exercise),
+            Mode::Compile => println!("Successfully ran {exercise}!"),
+            Mode::Test => println!("Successfully tested {exercise}!"),
+            Mode::Clippy => println!("Successfully checked {exercise}!"),
         }
 
         if let State::Pending(context) = exercise.state()? {
-- 
cgit v1.2.3