fix(wasm): Fix nolog feature for wasm

adetante · Nov 25, 2019 · 3160de6 · 3160de6
1 parent ceaeba6
commit 3160de6
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/src/log.rs b/src/log.rs
@@ -1,63 +1,63 @@
 #[allow(unused_macros)]
 
 cfg_if! {
-    if #[cfg(feature = "wasm")] {
-        use web_sys;
-        use web_sys::Performance;
-
+    if #[cfg(feature = "nolog")] {
         macro_rules! log {
-            ($($t:tt)*) => (web_sys::console::log_1(&format_args!($($t)*).to_string().into()))
+            ($($t:tt)*) => ()
         }
 
         macro_rules! elog {
-            ($($t:tt)*) => (web_sys::console::log_1(&format_args!($($t)*).to_string().into()))
+            ($($t:tt)*) => ()
         }
 
         macro_rules! log_verbose {
-            ($($t:tt)*) => (if $crate::verbose_flag() { web_sys::console::log_1(&format_args!($($t)*).to_string().into()) })
+            ($($t:tt)*) => ()
         }
 
         macro_rules! elog_verbose {
-            ($($t:tt)*) => (if $crate::verbose_flag() { web_sys::console::log_1(&format_args!($($t)*).to_string().into()) })
+            ($($t:tt)*) => ()
         }
 
-        pub struct Stopwatch {
-            start: f64,
-            perf: Performance
-        }
+        pub struct Stopwatch {}
 
         impl Stopwatch {
             pub fn new() -> Stopwatch {
-                let perf = web_sys::window().unwrap().performance().unwrap();
-                Stopwatch { start: perf.now(), perf }
-            }
-
-            pub fn elapsed(&self) -> f64 {
-                (self.perf.now() - self.start) / 1000.0
+                Stopwatch {}
             }
         }
-    } else if #[cfg(feature = "nolog")] {
+    } else if #[cfg(feature = "wasm")] {
+        use web_sys;
+        use web_sys::Performance;
+
         macro_rules! log {
-            ($($t:tt)*) => ()
+            ($($t:tt)*) => (web_sys::console::log_1(&format_args!($($t)*).to_string().into()))
         }
 
         macro_rules! elog {
-            ($($t:tt)*) => ()
+            ($($t:tt)*) => (web_sys::console::log_1(&format_args!($($t)*).to_string().into()))
         }
 
         macro_rules! log_verbose {
-            ($($t:tt)*) => ()
+            ($($t:tt)*) => (if $crate::verbose_flag() { web_sys::console::log_1(&format_args!($($t)*).to_string().into()) })
         }
 
         macro_rules! elog_verbose {
-            ($($t:tt)*) => ()
+            ($($t:tt)*) => (if $crate::verbose_flag() { web_sys::console::log_1(&format_args!($($t)*).to_string().into()) })
         }
 
-        pub struct Stopwatch {}
+        pub struct Stopwatch {
+            start: f64,
+            perf: Performance
+        }
 
         impl Stopwatch {
             pub fn new() -> Stopwatch {
-                Stopwatch {}
+                let perf = web_sys::window().unwrap().performance().unwrap();
+                Stopwatch { start: perf.now(), perf }
+            }
+
+            pub fn elapsed(&self) -> f64 {
+                (self.perf.now() - self.start) / 1000.0
             }
         } 
     } else {