Review jsonpath_rs (2)

README.md

@@ -6,7 +6,7 @@
 [![Forum](https://img.shields.io/badge/Forum-RedisJSON-blue)](https://forum.redislabs.com/c/modules/redisjson)
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 
-A JSONPath library for rust. The idea behind this library is that it can operate on any json representation as long as it implements the [`SelectValue`](src/select_value.rs) triat. The library has an implementation for [serde_json value](https://docs.serde.rs/serde_json/value/enum.Value.html) and [ivalue](https://docs.rs/tch/0.1.1/tch/enum.IValue.html).
+A JSONPath library for rust. The idea behind this library is that it can operate on any json representation as long as it implements the [`SelectValue`](src/select_value.rs) trait. The library has an implementation for [serde_json value](https://docs.serde.rs/serde_json/value/enum.Value.html) and [ivalue](https://docs.rs/tch/0.1.1/tch/enum.IValue.html).
 
 ### Getting Started
 Add the following to your cargo.toml

src/grammer.pest

@@ -1,4 +1,4 @@
-literal = @{('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | "-" | "_" | "`" | "~" | "+" | "#" | "%" | "$" | "^" | "/")+}
+literal = @{('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | "-" | "_" | "`" | "~" | "+" | "#" | "%" | "$" | "^" | "/" | ":")+}
 
 string = _{("'" ~ (string_value) ~ "'") | ("\"" ~ (string_value) ~ "\"") | ("\"" ~ (string_value_escape_1) ~ "\"") | ("'" ~ (string_value_escape_2) ~ "'")}
     string_escape = @{"\\"}

src/json_node.rs

@@ -107,8 +107,8 @@ impl SelectValue for Value {
     fn get_long(&self) -> i64 {
         match self {
             Value::Number(n) => {
-                if n.is_i64() || n.is_u64() {
-                    n.as_i64().unwrap()
+                if let Some(n) = n.as_i64() {
+                    n
                 } else {
                     panic!("not a long");
                 }
@@ -155,9 +155,10 @@ impl SelectValue for IValue {
     }
 
     fn contains_key(&self, key: &str) -> bool {
-        match self.as_object() {
-            Some(o) => o.contains_key(key),
-            _ => false,
+        if let Some(o) = self.as_object() {
+            o.contains_key(key)
+        } else {
+            false
         }
     }
 
@@ -247,7 +248,7 @@ impl SelectValue for IValue {
                 }
             }
             _ => {
-                panic!("not a long");
+                panic!("not a number");
             }
         }
     }
@@ -262,7 +263,7 @@ impl SelectValue for IValue {
                 }
             }
             _ => {
-                panic!("not a double");
+                panic!("not a number");
             }
         }
     }