diff options
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/path/parser.rs | 4 | ||||
| -rw-r--r-- | src/value.rs | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -22,7 +22,7 @@ hjson = ["serde-hjson"] [dependencies] lazy_static = "0.2" serde = "^1.0.8" -nom = "^3.0.0" +nom = "^3.2.1" toml = { version = "^0.4.1", optional = true } serde_json = { version = "^1.0.2", optional = true } diff --git a/src/path/parser.rs b/src/path/parser.rs index d4b13dd..7629193 100644 --- a/src/path/parser.rs +++ b/src/path/parser.rs @@ -65,7 +65,7 @@ pub fn from_str(input: &str) -> Result<Expression, ErrorKind> { // Forward Incomplete and Error result => { - return result.to_result(); + return result.to_result().map_err(|e| e.into_error_kind()); } } } @@ -74,7 +74,7 @@ pub fn from_str(input: &str) -> Result<Expression, ErrorKind> { } // Forward Incomplete and Error - result => result.to_result(), + result => result.to_result().map_err(|e| e.into_error_kind()), } } diff --git a/src/value.rs b/src/value.rs index 3b700cf..a8ae94a 100644 --- a/src/value.rs +++ b/src/value.rs @@ -5,7 +5,7 @@ use error::*; use serde::de::{Deserialize, Deserializer, Visitor}; /// Underlying kind of the configuration value. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub enum ValueKind { Nil, Boolean(bool), @@ -114,7 +114,7 @@ impl Display for ValueKind { } /// A configuration value. -#[derive(Default, Debug, Clone)] +#[derive(Default, Debug, Clone, PartialEq)] pub struct Value { /// A description of the original location of the value. /// |