Merge pull request #400 from matthiasbeyer/libimagutil/match-helper

Libimagutil/match helper

libimagentrylink/Cargo.toml

@@ -17,3 +17,6 @@ path = "../libimagstore"
 [dependencies.libimagerror]
 path = "../libimagerror"
 
+[dependencies.libimagutil]
+path = "../libimagutil"
+

libimagentrylink/src/internal.rs

@@ -160,7 +160,7 @@ fn process_rw_result(links: StoreResult<Option<Value>>) -> Result<Vec<Link>> {
         }
     };
 
-    if !links.iter().all(|l| match *l { Value::String(_) => true, _ => false }) {
+    if !links.iter().all(|l| is_match!(*l, Value::String(_))) {
         debug!("At least one of the Values which were expected in the Array of links is a non-String!");
         debug!("Generating LinkError");
         return Err(LinkError::new(LinkErrorKind::ExistingLinkTypeWrong, None));

libimagentrylink/src/lib.rs

@@ -21,6 +21,7 @@ extern crate crypto;
 
 #[macro_use] extern crate libimagstore;
 #[macro_use] extern crate libimagerror;
+#[macro_use] extern crate libimagutil;
 
 module_entry_path_mod!("links", "0.1.0");
 

libimagentrytag/Cargo.toml

@@ -16,3 +16,6 @@ path = "../libimagstore"
 [dependencies.libimagerror]
 path = "../libimagerror"
 
+[dependencies.libimagutil]
+path = "../libimagutil"
+

libimagentrytag/src/lib.rs

@@ -20,6 +20,7 @@ extern crate toml;
 
 extern crate libimagstore;
 #[macro_use] extern crate libimagerror;
+#[macro_use] extern crate libimagutil;
 
 pub mod error;
 pub mod exec;

libimagentrytag/src/tagable.rs

@@ -37,7 +37,7 @@ impl Tagable for EntryHeader {
 
         match tags {
             Some(Value::Array(tags)) => {
-                if !tags.iter().all(|t| match *t { Value::String(_) => true, _ => false }) {
+                if !tags.iter().all(|t| is_match!(*t, Value::String(_))) {
                     return Err(TagError::new(TagErrorKind::TagTypeError, None));
                 }
                 if tags.iter().any(|t| match *t {
@@ -110,7 +110,7 @@ impl Tagable for EntryHeader {
         }
         let tags = tags.unwrap();
 
-        if !tags.iter().all(|t| match *t { Value::String(_) => true, _ => false }) {
+        if !tags.iter().all(|t| is_match!(*t, Value::String(_))) {
             return Err(TagError::new(TagErrorKind::TagTypeError, None));
         }
 

libimagstore/Cargo.toml

@@ -18,6 +18,9 @@ walkdir = "0.1.5"
 [dependencies.libimagerror]
 path = "../libimagerror"
 
+[dependencies.libimagutil]
+path = "../libimagutil"
+
 [dev-dependencies]
 tempdir = "0.3.4"
 env_logger = "0.3"

libimagstore/src/configuration.rs

@@ -128,15 +128,13 @@ pub fn config_is_valid(config: &Option<Value>) -> bool {
 
             // The section "hooks" has maps which have a key "aspect" which has a value of type
             // String
-            check_all_inner_maps_have_key_with(t, "hooks", "aspect", |asp| {
+            check_all_inner_maps_have_key_with(t, "hooks", "aspect",
-                match *asp { Value::String(_) => true, _ => false }
+                                               |asp| is_match!(asp, &Value::String(_))) &&
-            }) &&
 
             // The section "aspects" has maps which have a key "parllel" which has a value of type
             // Boolean
-            check_all_inner_maps_have_key_with(t, "aspects", "parallel", |asp| {
+            check_all_inner_maps_have_key_with(t, "aspects", "parallel",
-                match *asp { Value::Boolean(_) => true, _ => false, }
+                                               |asp| is_match!(asp, &Value::Boolean(_)))
-            })
         }
         _ => {
             write!(stderr(), "Store config is no table").ok();

libimagstore/src/hook/aspect.rs

@@ -41,7 +41,7 @@ impl StoreIdAccessor for Aspect {
         use crossbeam;
 
         let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
-        if !accessors.iter().all(|a| match *a { HDA::StoreIdAccess(_)  => true, _ => false }) {
+        if !accessors.iter().all(|a| is_match!(*a, HDA::StoreIdAccess(_))) {
             return Err(HE::new(HEK::AccessTypeViolation, None));
         }
 
@@ -76,11 +76,7 @@ impl MutableHookDataAccessor for Aspect {
         let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
 
         fn is_file_accessor(a: &HDA) -> bool {
-            match *a {
+            is_match!(*a, HDA::MutableAccess(_) | HDA::NonMutableAccess(_))
-                HDA::MutableAccess(_)     |
-                HDA::NonMutableAccess(_)  => true,
-                _ => false,
-            }
         }
 
         if !accessors.iter().all(|a| is_file_accessor(a)) {
@@ -108,7 +104,7 @@ impl NonMutableHookDataAccessor for Aspect {
         use crossbeam;
 
         let accessors : Vec<HDA> = self.hooks.iter().map(|h| h.accessor()).collect();
-        if !accessors.iter().all(|a| match *a { HDA::NonMutableAccess(_)  => true, _ => false }) {
+        if !accessors.iter().all(|a| is_match!(*a, HDA::NonMutableAccess(_))) {
             return Err(HE::new(HEK::AccessTypeViolation, None));
         }
 

libimagstore/src/lib.rs

@@ -25,6 +25,7 @@ extern crate crossbeam;
 extern crate walkdir;
 
 #[macro_use] extern crate libimagerror;
+#[macro_use] extern crate libimagutil;
 
 pub mod storeid;
 pub mod error;