Merge pull request #30 from Sellig6792/develop

v0.4.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cprint"
 description = "Cargo-like print"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 authors = ["Sellig6792 <sellig6792@gmail.com>"]
 homepage = "https://github.com/Sellig6792/cprint"

src/ceprint_macros.rs

@@ -8,19 +8,26 @@
 /// ```
 #[macro_export]
 macro_rules! ceprint {
-    ($msg:expr) => {
+    ($msg:expr) => {{
+        use $crate::coloration::{colorize_string, Color::Red};
+
         print!(
             "{} {}",
-            format!("{}{}", " ".repeat(12 - "Error".len()), "Error").apply_color(Color::Red),
+            format!(
+                "{}{}",
+                " ".repeat(12 - "Error".len()),
+                colorize_string("Error", Red)
+            ),
             $msg
         );
-    };
+    }};
 }
 
 /// Same as [`ceprint!`] but with a newline at the end.
 #[macro_export]
 macro_rules! ceprintln {
-    ($title:expr, $msg:expr) => {
-        ceprintln!($title, $msg, Color::Red);
+    ($msg:expr) => {
+        $crate::ceprint!($msg);
+        println!();
     };
 }

src/coloration.rs

@@ -76,11 +76,20 @@ where
     }
 }
 
+pub fn colorize_string<FS, ColorType>(string: &FS, color: ColorType) -> ColoredString
+where
+    FS: AsRef<str> + ?Sized,
+    ColorType: Into<Color>,
+{
+    string.apply_color(color)
+}
+
 #[cfg(test)]
 mod tests {
-    use super::*;
     use colored::Colorize;
 
+    use super::*;
+
     #[test]
     fn coloration_trait_with_str() {
         let a = "Hello".apply_color(Color::Red);

src/cprint_macros.rs

@@ -8,13 +8,15 @@
 /// ```
 #[macro_export]
 macro_rules! cprint {
-    ($title:expr, $msg:expr, $color:expr) => {
+    ($title:expr, $msg:expr, $color:expr) => {{
+        use $crate::coloration::Coloration;
+
         print!(
             "{} {}",
             format!("{}{}", " ".repeat(12 - $title.len()), $title).apply_color($color),
             $msg
         );
-    };
+    }};
 }
 
 /// Same as [`cprint!`] but with a newline at the end.

src/lib.rs

@@ -10,10 +10,10 @@
 //! ```
 
 #[cfg(feature = "coloration")]
-mod coloration;
+pub use coloration::{Color, Coloration};
 
 #[cfg(feature = "coloration")]
-pub use coloration::{Color, Coloration};
+pub mod coloration;
 
 #[cfg(feature = "cprint")]
 mod cprint_macros;