Move macros to //util folder

cas/store/BUILD

@@ -31,6 +31,7 @@ rust_library(
         ":traits",
         "//third_party:tokio",
         "//third_party:hex",
+        "//util:macros",
     ],
     proc_macro_deps = ["//third_party:async_trait"],
     visibility = ["//cas:__pkg__"]

cas/store/memory_store.rs

@@ -9,6 +9,8 @@ use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, Error, Error
 
 use traits::StoreTrait;
 
+use macros::{error_if, make_err};
+
 #[derive(Debug)]
 pub struct MemoryStore {
     map: HashMap<[u8; 32], Arc<Vec<u8>>>,
@@ -22,16 +24,6 @@ impl MemoryStore {
     }
 }
 
-macro_rules! make_err {
-    ($($arg:tt)+) => {{
-        Error::new(
-            ErrorKind::InvalidInput,
-            format!("{}", format_args!($($arg)+)
-            ),
-        )
-    }};
-}
-
 #[async_trait]
 impl StoreTrait for MemoryStore {
     async fn has(&self, hash: &str, _expected_size: usize) -> Result<bool, Error> {
@@ -50,14 +42,13 @@ impl StoreTrait for MemoryStore {
             .or_else(|_| Err(make_err!("Hex length is not 64 hex characters")))?;
         let mut buffer = Vec::new();
         let read_size = reader.read_to_end(&mut buffer).await?;
-        if read_size != expected_size {
-            return Err(make_err!(
-                "Expected size {} but got size {} for hash {} CAS insert",
-                expected_size,
-                read_size,
-                hash
-            ));
-        }
+        error_if!(
+            read_size != expected_size,
+            "Expected size {} but got size {} for hash {} CAS insert",
+            expected_size,
+            read_size,
+            hash
+        );
         self.map.insert(raw_key, Arc::new(buffer));
         Ok(())
     }

util/BUILD

@@ -0,0 +1,9 @@
+# Copyright 2020 Nathan (Blaise) Bruer.  All rights reserved.
+
+load("@io_bazel_rules_rust//rust:rust.bzl", "rust_library")
+
+rust_library(
+    name = "macros",
+    srcs = ["macros.rs"],
+    visibility = ["//visibility:public"],
+)

util/macros.rs

@@ -0,0 +1,21 @@
+// Copyright 2020 Nathan (Blaise) Bruer.  All rights reserved.
+
+#[macro_export]
+macro_rules! make_err {
+    ($($arg:tt)+) => {{
+        Error::new(
+            ErrorKind::InvalidInput,
+            format!("{}", format_args!($($arg)+)
+            ),
+        )
+    }};
+}
+
+#[macro_export]
+macro_rules! error_if {
+    ($cond:expr, $($arg:tt)+) => {{
+      if $cond {
+        return Err(make_err!($($arg)+));
+      }
+    }}
+}