cleanup: use fyi_ansi for formatting

joshstoik1 · joshstoik1 · commit 76b4628bce71 · 2025-04-09T21:14:39.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,6 +87,7 @@ dowser = "0.12.*"
 [dependencies]
 dactyl = "0.10.*"
 dowser = "0.12.*"
+fyi_ansi = "2.0.*"
 fyi_msg = "2.0.*"
 svg = "=0.18.0"
 write_atomic = "0.6.*"
diff --git a/src/error.rs b/src/error.rs
@@ -2,6 +2,11 @@
 # Yesvgmap: Errors
 */
 
+use fyi_ansi::{
+	ansi,
+	csi,
+	dim,
+};
 use std::{
 	error::Error,
 	fmt,
@@ -24,7 +29,7 @@ const HELP: &str = concat!(r#"
  '.       /`\   (   '._/
    `\   .;  |  . '.
      ).'  )/|      \
-     `    ` |  \|   |  "#, "\x1b[38;5;199mYesvgmap\x1b[0;38;5;69m v", env!("CARGO_PKG_VERSION"), "\x1b[0m", r#"
+     `    ` |  \|   |  "#, csi!(199), "Yesvgmap", ansi!((cornflower_blue) " v", env!("CARGO_PKG_VERSION")), r#"
              \  |   |  SVG sprite generator.
               '.|   |
                  \  '\__
@@ -113,7 +118,11 @@ impl fmt::Display for SvgError {
 		match self {
 			Self::Duplicate(s) => write!(f, "Normalized name collision: {s}."),
 			Self::FileName(p) => write!(f, "File name has no ASCII alphanumeric or '-': {p:?}"),
-			Self::InvalidCli(s) => write!(f, "Invalid/unknown arg: \x1b[2m{s}\x1b[0m"),
+			Self::InvalidCli(s) => write!(
+				f,
+				concat!("Invalid/unknown arg: ", dim!("{}")),
+				s,
+			),
 			Self::Parse(p) => write!(f, "Unable to parse: {p:?}."),
 			Self::Read(p) => write!(f, "Unreadable: {p:?}."),
 			Self::Viewbox(p) => write!(f, "Missing viewBox: {p:?}"),
diff --git a/src/img.rs b/src/img.rs
@@ -3,6 +3,7 @@
 */
 
 use crate::SvgError;
+use fyi_ansi::ansi;
 use fyi_msg::Msg;
 use std::{
 	borrow::Cow,
@@ -155,7 +156,7 @@ contexts; the following image{} might need to be refactored:",
 
 			warned.sort_unstable();
 			for w in warned {
-				eprintln!("    \x1b[1;93m•\x1b[0m {w}");
+				eprintln!(concat!(ansi!((bold, light_yellow) "    •"), " {}"), w);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`use crate::SvgError;`
	`6`	`+use fyi_ansi::ansi;`
`6`	`7`	`use fyi_msg::Msg;`
`7`	`8`	`use std::{`
`8`	`9`	`borrow::Cow,`
`@@ -155,7 +156,7 @@ contexts; the following image{} might need to be refactored:",`
`155`	`156`
`156`	`157`	`warned.sort_unstable();`
`157`	`158`	`for w in warned {`
`158`		`- eprintln!(" \x1b[1;93m•\x1b[0m {w}");`
	`159`	`+ eprintln!(concat!(ansi!((bold, light_yellow) " •"), " {}"), w);`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`