refac(vga::kinfo): move attempt!() macro to VGA crate from kernel

So that it can be used elsewhere.
sos-os · May 29, 2017 · 92a2c39 · 92a2c39
1 parent 8f0dbdc
commit 92a2c39
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -68,32 +68,6 @@ pub mod logger;
 
 use params::InitParams;
 
-macro_rules! attempt {
-    ($task:expr => $msg:expr, dots: $dots:expr) => {
-        {
-            print!("{}{}", $dots, $msg);
-            match $task {
-               Ok(result) => {
-                    println!( "{:indent$}{res:}"
-                            , ""
-                            , indent = 70 - concat!($dots,$msg).len()
-                            , res = "[ OKAY ]");
-                    info!("{} [ OKAY ]", $msg);
-                    result
-                }
-              , Err(why) => {
-                    println!( "{:indent$}{res:}"
-                              , ""
-                              , indent = 70 - concat!($dots,$msg).len()
-                              , res = "[ FAIL ]");
-                    panic!("{:?}", why);
-              }
-            }
-        }
-
-    };
-}
-
 /// SOS version number
 pub const VERSION_STRING: &'static str
     = concat!("Stupid Operating System v", env!("CARGO_PKG_VERSION"));

diff --git a/vga/src/kinfo.rs b/vga/src/kinfo.rs
@@ -8,6 +8,33 @@
 //
 //! Macros for kernel-level logging
 
+#[macro_export]
+macro_rules! attempt {
+    ($task:expr => $msg:expr, dots: $dots:expr) => {
+        {
+            print!("{}{}", $dots, $msg);
+            match $task {
+               Ok(result) => {
+                    println!( "{:indent$}{res:}"
+                            , ""
+                            , indent = 70 - concat!($dots,$msg).len()
+                            , res = "[ OKAY ]");
+                    info!("{} [ OKAY ]", $msg);
+                    result
+                }
+              , Err(why) => {
+                    println!( "{:indent$}{res:}"
+                              , ""
+                              , indent = 70 - concat!($dots,$msg).len()
+                              , res = "[ FAIL ]");
+                    panic!("{:?}", why);
+              }
+            }
+        }
+
+    };
+}
+
 #[macro_export]
 macro_rules! kinfo {
     ( dots: $dots:expr, target: $target:expr, $status:expr ) => {