Merge pull request #1 from RedisJSON/gkorland-clippy

clean clippy warnings + fmt

Author: gkorland

src/json_node.rs

@@ -1,6 +1,6 @@
 use crate::select_value::{SelectValue, SelectValueType};
-use serde_json::Value;
 use ijson::{IValue, ValueType};
+use serde_json::Value;
 
 impl SelectValue for Value {
     fn get_type(&self) -> SelectValueType {
@@ -11,9 +11,7 @@ impl SelectValue for Value {
             Value::Array(_) => SelectValueType::Array,
             Value::Object(_) => SelectValueType::Object,
             Value::Number(n) => {
-                if n.is_i64() {
-                    SelectValueType::Long
-                } else if n.is_u64() {
+                if n.is_i64() || n.is_u64() {
                     SelectValueType::Long
                 } else if n.is_f64() {
                     SelectValueType::Double
@@ -46,9 +44,9 @@ impl SelectValue for Value {
         }
     }
 
-    fn items<'a>(&'a self) -> Option<Box<dyn Iterator<Item = (&'a str, &'a Self)> + 'a>>{
+    fn items<'a>(&'a self) -> Option<Box<dyn Iterator<Item = (&'a str, &'a Self)> + 'a>> {
         match self {
-            Value::Object(o) => Some(Box::new(o.iter().map(|(k,v)| (&k[..],v)))),
+            Value::Object(o) => Some(Box::new(o.iter().map(|(k, v)| (&k[..], v)))),
             _ => None,
         }
     }
@@ -68,18 +66,15 @@ impl SelectValue for Value {
         }
     }
 
-    fn get_index<'a>(&'a self, index: usize) -> Option<&'a Self> {
+    fn get_index(&self, index: usize) -> Option<&Self> {
         match self {
             Value::Array(arr) => arr.get(index),
             _ => None,
         }
     }
 
     fn is_array(&self) -> bool {
-        match self {
-            Value::Array(_) => true,
-            _ => false,
-        }
+        matches!(self, Value::Array(_))
     }
 
     fn get_str(&self) -> String {
@@ -91,7 +86,7 @@ impl SelectValue for Value {
         }
     }
 
-    fn as_str<'a>(&'a self) -> &'a str {
+    fn as_str(&self) -> &str {
         match self {
             Value::String(s) => s.as_str(),
             _ => {
@@ -104,8 +99,7 @@ impl SelectValue for Value {
         match self {
             Value::Bool(b) => *b,
             _ => {
-                assert!(false, "not a bool");
-                false
+                panic!("not a bool");
             }
         }
     }
@@ -116,13 +110,11 @@ impl SelectValue for Value {
                 if n.is_i64() || n.is_u64() {
                     n.as_i64().unwrap()
                 } else {
-                    assert!(false, "not a long");
-                    0
+                    panic!("not a long");
                 }
             }
             _ => {
-                assert!(false, "not a long");
-                0
+                panic!("not a long");
             }
         }
     }
@@ -133,13 +125,11 @@ impl SelectValue for Value {
                 if n.is_f64() {
                     n.as_f64().unwrap()
                 } else {
-                    assert!(false, "not a double");
-                    0.1
+                    panic!("not a double");
                 }
             }
             _ => {
-                assert!(false, "not a double");
-                0.1
+                panic!("not a double");
             }
         }
     }
@@ -159,7 +149,7 @@ impl SelectValue for IValue {
                     SelectValueType::Double
                 } else {
                     SelectValueType::Long
-                } 
+                }
             }
         }
     }
@@ -172,9 +162,9 @@ impl SelectValue for IValue {
     }
 
     fn values<'a>(&'a self) -> Option<Box<dyn Iterator<Item = &'a Self> + 'a>> {
-        if let Some(arr) = self.as_array(){
+        if let Some(arr) = self.as_array() {
             Some(Box::new(arr.iter()))
-        } else if  let Some(o) = self.as_object(){
+        } else if let Some(o) = self.as_object() {
             Some(Box::new(o.values()))
         } else {
             None
@@ -188,21 +178,18 @@ impl SelectValue for IValue {
         }
     }
 
-    fn items<'a>(&'a self) -> Option<Box<dyn Iterator<Item = (&'a str, &'a Self)> + 'a>>{
+    fn items<'a>(&'a self) -> Option<Box<dyn Iterator<Item = (&'a str, &'a Self)> + 'a>> {
         match self.as_object() {
-            Some(o) => Some(Box::new(o.iter().map(|(k,v)| (&k[..],v)))),
+            Some(o) => Some(Box::new(o.iter().map(|(k, v)| (&k[..], v)))),
             _ => None,
         }
     }
 
     fn len(&self) -> Option<usize> {
-        if let Some(arr) = self.as_array(){
-            Some(arr.len())
-        } else if let Some(obj) = self.as_object(){
-            Some(obj.len())
-        } else {
-            None
-        }
+        self.as_array().map_or_else(
+            || self.as_object().map(ijson::IObject::len),
+            |arr| Some(arr.len()),
+        )
     }
 
     fn get_key<'a>(&'a self, key: &str) -> Option<&'a Self> {
@@ -212,15 +199,15 @@ impl SelectValue for IValue {
         }
     }
 
-    fn get_index<'a>(&'a self, index: usize) -> Option<&'a Self> {
+    fn get_index(&self, index: usize) -> Option<&Self> {
         match self.as_array() {
             Some(arr) => arr.get(index),
             _ => None,
         }
     }
 
     fn is_array(&self) -> bool {
-        self.is_array() 
+        self.is_array()
     }
 
     fn get_str(&self) -> String {
@@ -232,7 +219,7 @@ impl SelectValue for IValue {
         }
     }
 
-    fn as_str<'a>(&'a self) -> &'a str {
+    fn as_str(&self) -> &str {
         match self.as_string() {
             Some(s) => s.as_str(),
             _ => {
@@ -245,8 +232,7 @@ impl SelectValue for IValue {
         match self.to_bool() {
             Some(b) => b,
             _ => {
-                assert!(false, "not a bool");
-                false
+                panic!("not a bool");
             }
         }
     }
@@ -255,15 +241,13 @@ impl SelectValue for IValue {
         match self.as_number() {
             Some(n) => {
                 if n.has_decimal_point() {
-                    assert!(false, "not a long");
-                    0
+                    panic!("not a long");
                 } else {
                     n.to_i64().unwrap()
                 }
             }
             _ => {
-                assert!(false, "not a long");
-                0
+                panic!("not a long");
             }
         }
     }
@@ -274,13 +258,11 @@ impl SelectValue for IValue {
                 if n.has_decimal_point() {
                     n.to_f64().unwrap()
                 } else {
-                    assert!(false, "not a double");
-                    0.1
+                    panic!("not a double");
                 }
             }
             _ => {
-                assert!(false, "not a double");
-                0.1
+                panic!("not a double");
             }
         }
     }