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: [PATCH] optimized the UI code (#1830)
---
src/ui.rs | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/ui.rs b/src/ui.rs
index 1ee46316..74835e13 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! success {
+macro_rules! warn {
($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!("⚠️ ", "!", red, $fmt, $ex);
+ }};
+}
+
+macro_rules! success {
+ ($fmt:literal, $ex:expr) => {{
+ print_emoji!("✅ ", "✓", green, $fmt, $ex);
}};
}