Merge pull request #205 from kpcyrd/update

Update dependencies

5 files changed, 7 insertions, 7 deletions

diff --git a/Cargo.toml b/Cargo.toml
index abec5bd..ca28c06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ ini = ["rust-ini"]
 [dependencies]
 lazy_static = "1.0"
 serde = "1.0.8"
-nom = "5.0.0"
+nom = "6"
 
 toml = { version = "0.5", optional = true }
 serde_json = { version = "1.0.2", optional = true }
diff --git a/examples/glob/Cargo.toml b/examples/glob/Cargo.toml
index 32b7ba3..2fe1b1e 100644
--- a/examples/glob/Cargo.toml
+++ b/examples/glob/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 
 [dependencies]
 config = { path = "../../" }
-glob = "0.2"
+glob = "0.3"
diff --git a/examples/global/Cargo.toml b/examples/global/Cargo.toml
index dacbfe2..8a5155f 100644
--- a/examples/global/Cargo.toml
+++ b/examples/global/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 
 [dependencies]
 config = { path = "../../" }
-lazy_static = "^0.2.8"
+lazy_static = "1"
diff --git a/examples/watch/Cargo.toml b/examples/watch/Cargo.toml
index 36b2880..e3245cb 100644
--- a/examples/watch/Cargo.toml
+++ b/examples/watch/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2018"
 
 [dependencies]
 config = { path = "../../" }
-lazy_static = "^0.2.8"
+lazy_static = "1"
 notify = "^4.0.0"
diff --git a/src/path/parser.rs b/src/path/parser.rs
index 3f7bc52..1867657 100644
--- a/src/path/parser.rs
+++ b/src/path/parser.rs
@@ -35,7 +35,7 @@ fn ident(i: &str) -> IResult<&str, Expression> {
     map(raw_ident, Expression::Identifier)(i)
 }
 
-fn postfix<'a>(expr: Expression) -> impl Fn(&'a str) -> IResult<&'a str, Expression> {
+fn postfix<'a>(expr: Expression) -> impl FnMut(&'a str) -> IResult<&'a str, Expression> {
     let e2 = expr.clone();
     let child = map(preceded(tag("."), raw_ident), move |id| {
         Expression::Child(Box::new(expr.clone()), id)
@@ -73,10 +73,10 @@ pub fn from_str(input: &str) -> Result<Expression, ErrorKind> {
     }
 }
 
-pub fn to_error_kind(e: Err<(&str, ErrorKind)>) -> ErrorKind {
+pub fn to_error_kind(e: Err<nom::error::Error<&str>>) -> ErrorKind {
     match e {
         Err::Incomplete(_) => ErrorKind::Complete,
-        Err::Failure((_, e)) | Err::Error((_, e)) => e,
+        Err::Failure(e) | Err::Error(e) => e.code,
     }
 }