style adaptations

these were introduced following suggestions from
https://crates.io/crate/clippy

7 files changed, 17 insertions, 20 deletions

diff --git a/libimagentryfilter/src/builtin/header/field_gt.rs b/libimagentryfilter/src/builtin/header/field_gt.rs
index 6975737b..7067399d 100644
--- a/libimagentryfilter/src/builtin/header/field_gt.rs
+++ b/libimagentryfilter/src/builtin/header/field_gt.rs
@@ -14,15 +14,15 @@ struct EqGt {
 impl Predicate for EqGt {
 
     fn evaluate(&self, v: Value) -> bool {
-        match &self.comp {
-            &Value::Integer(i) => {
+        match self.comp {
+            Value::Integer(i) => {
                 match v {
                     Value::Integer(j) => i > j,
                     Value::Float(f) => (i as f64) > f,
                     _ => false,
                 }
             },
-            &Value::Float(f) => {
+            Value::Float(f) => {
                 match v {
                     Value::Integer(i) => f > (i as f64),
                     Value::Float(d) => f > d,
diff --git a/libimagentryfilter/src/builtin/header/field_isempty.rs b/libimagentryfilter/src/builtin/header/field_isempty.rs
index a7ff4ab1..3da9360f 100644
--- a/libimagentryfilter/src/builtin/header/field_isempty.rs
+++ b/libimagentryfilter/src/builtin/header/field_isempty.rs
@@ -27,11 +27,11 @@ impl Filter for FieldIsEmpty {
             .map(|v| {
                 match v {
                     Some(Value::Array(a))   => a.is_empty(),
-                    Some(Value::Boolean(_)) => false,
-                    Some(Value::Float(_))   => false,
-                    Some(Value::Integer(_)) => false,
                     Some(Value::String(s))  => s.is_empty(),
                     Some(Value::Table(t))   => t.is_empty(),
+                    Some(Value::Boolean(_)) |
+                    Some(Value::Float(_))   |
+                    Some(Value::Integer(_)) => false,
                     _                       => true,
                 }
             })
diff --git a/libimagentryfilter/src/builtin/header/field_istype.rs b/libimagentryfilter/src/builtin/header/field_istype.rs
index 8423c0ab..5af73623 100644
--- a/libimagentryfilter/src/builtin/header/field_istype.rs
+++ b/libimagentryfilter/src/builtin/header/field_istype.rs
@@ -21,11 +21,11 @@ impl Type {
 
     fn matches(&self, v: &Value) -> bool {
         match (self, v) {
-            (&Type::String,  &Value::String(_))  => true,
-            (&Type::Integer, &Value::Integer(_)) => true,
-            (&Type::Float,   &Value::Float(_))   => true,
-            (&Type::Boolean, &Value::Boolean(_)) => true,
-            (&Type::Array,   &Value::Array(_))   => true,
+            (&Type::String,  &Value::String(_))  |
+            (&Type::Integer, &Value::Integer(_)) |
+            (&Type::Float,   &Value::Float(_))   |
+            (&Type::Boolean, &Value::Boolean(_)) |
+            (&Type::Array,   &Value::Array(_))   |
             (&Type::Table,   &Value::Table(_))   => true,
             _                                    => false,
         }
diff --git a/libimagentryfilter/src/builtin/header/field_lt.rs b/libimagentryfilter/src/builtin/header/field_lt.rs
index 15558d4b..dee98476 100644
--- a/libimagentryfilter/src/builtin/header/field_lt.rs
+++ b/libimagentryfilter/src/builtin/header/field_lt.rs
@@ -14,15 +14,15 @@ struct EqLt {
 impl Predicate for EqLt {
 
     fn evaluate(&self, v: Value) -> bool {
-        match &self.comp {
-            &Value::Integer(i) => {
+        match self.comp {
+            Value::Integer(i) => {
                 match v {
                     Value::Integer(j) => i < j,
                     Value::Float(f) => (i as f64) < f,
                     _ => false,
                 }
             },
-            &Value::Float(f) => {
+            Value::Float(f) => {
                 match v {
                     Value::Integer(i) => f < (i as f64),
                     Value::Float(d) => f < d,
diff --git a/libimagentryfilter/src/builtin/header/version/eq.rs b/libimagentryfilter/src/builtin/header/version/eq.rs
index 0e28cfb2..e6b93893 100644
--- a/libimagentryfilter/src/builtin/header/version/eq.rs
+++ b/libimagentryfilter/src/builtin/header/version/eq.rs
@@ -23,7 +23,7 @@ impl Filter for VersionEq {
         e.get_header()
             .read("imag.version")
             .map(|val| {
-                val.map(|v| {
+                val.map_or(false, |v| {
                     match v {
                         Value::String(s) => {
                             match Version::parse(&s[..]) {
@@ -34,7 +34,6 @@ impl Filter for VersionEq {
                         _ => false,
                     }
                 })
-                .unwrap_or(false)
             })
             .unwrap_or(false)
     }
diff --git a/libimagentryfilter/src/builtin/header/version/gt.rs b/libimagentryfilter/src/builtin/header/version/gt.rs
index 119e64a8..f03b0fa9 100644
--- a/libimagentryfilter/src/builtin/header/version/gt.rs
+++ b/libimagentryfilter/src/builtin/header/version/gt.rs
@@ -23,7 +23,7 @@ impl Filter for VersionGt {
         e.get_header()
             .read("imag.version")
             .map(|val| {
-                val.map(|v| {
+                val.map_or(false, |v| {
                     match v {
                         Value::String(s) => {
                             match Version::parse(&s[..]) {
@@ -34,7 +34,6 @@ impl Filter for VersionGt {
                         _ => false,
                     }
                 })
-                .unwrap_or(false)
             })
             .unwrap_or(false)
     }
diff --git a/libimagentryfilter/src/builtin/header/version/lt.rs b/libimagentryfilter/src/builtin/header/version/lt.rs
index 6263f6de..5be6a191 100644
--- a/libimagentryfilter/src/builtin/header/version/lt.rs
+++ b/libimagentryfilter/src/builtin/header/version/lt.rs
@@ -23,7 +23,7 @@ impl Filter for VersionLt {
         e.get_header()
             .read("imag.version")
             .map(|val| {
-                val.map(|v| {
+                val.map_or(false, |v| {
                     match v {
                         Value::String(s) => {
                             match Version::parse(&s[..]) {
@@ -34,7 +34,6 @@ impl Filter for VersionLt {
                         _ => false,
                     }
                 })
-                .unwrap_or(false)
             })
             .unwrap_or(false)
     }