diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Cargo.toml | 8 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/path/parser.rs | 4 | ||||
| -rw-r--r-- | src/value.rs | 4 |
5 files changed, 16 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 308f401..6fc38aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 0.8.0 - 2018-01-26 + - Update lazy_static and yaml_rust + +## 0.7.1 - 2018-01-26 + - Be compatible with nom's verbose_errors feature (#50)[https://github.com/mehcode/config-rs/pull/50] + - Add `derive(PartialEq)` for Value (#54)[https://github.com/mehcode/config-rs/pull/54] + ## 0.7.0 - 2017-08-05 - Fix conflict with `serde_yaml`. [#39] @@ -1,6 +1,6 @@ [package] name = "config" -version = "0.7.0" +version = "0.8.0" description = "Layered configuration system for Rust applications." homepage = "https://github.com/mehcode/config-rs" repository = "https://github.com/mehcode/config-rs" @@ -20,13 +20,13 @@ yaml = ["yaml-rust"] hjson = ["serde-hjson"] [dependencies] -lazy_static = "0.2" +lazy_static = "1.0" 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 } -yaml-rust = { version = "^0.3.5", optional = true } +yaml-rust = { version = "^0.4", optional = true } serde-hjson = { version = "^0.8.1", optional = true } [dev-dependencies] @@ -24,7 +24,7 @@ ```toml [dependencies] -config = "0.6" +config = "0.8" ``` - `json` - Adds support for reading JSON files 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. /// |