From ba55af8109ad38f3501670a70715841f5969cfae Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Wed, 20 Sep 2017 12:42:39 +0200 Subject: fix weird nom errorkind issue --- Cargo.toml | 3 ++- src/path/parser.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c3789ab..44da107 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,8 @@ hjson = ["serde-hjson"] [dependencies] lazy_static = "0.2" serde = "^1.0.8" -nom = "^3.0.0" +# nom = "^3.0.0" +nom = { git = "github.com:snipsco/nom", rev = "3769283" } 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 { // 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 { } // Forward Incomplete and Error - result => result.to_result(), + result => result.to_result().map_err(|e| e.into_error_kind()), } } -- cgit v1.2.3 From e8e31fd64684233378641f4f3df43f06ada3d9f4 Mon Sep 17 00:00:00 2001 From: Kevin Lefevre Date: Mon, 16 Oct 2017 11:49:13 +0200 Subject: Fix ssh url --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 44da107..c1e39c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ hjson = ["serde-hjson"] lazy_static = "0.2" serde = "^1.0.8" # nom = "^3.0.0" -nom = { git = "github.com:snipsco/nom", rev = "3769283" } +nom = { git = "ssh://git@github.com/snipsco/nom", rev = "3769283" } toml = { version = "^0.4.1", optional = true } serde_json = { version = "^1.0.2", optional = true } -- cgit v1.2.3 From 1d76ab310fe807f1b56179fb604502ec30569792 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 20 Oct 2017 17:11:00 +0200 Subject: git->https (nom is public) --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c1e39c8..6d2fe81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ hjson = ["serde-hjson"] lazy_static = "0.2" serde = "^1.0.8" # nom = "^3.0.0" -nom = { git = "ssh://git@github.com/snipsco/nom", rev = "3769283" } +nom = { git = "https://github.com/snipsco/nom.git", rev = "3769283" } toml = { version = "^0.4.1", optional = true } serde_json = { version = "^1.0.2", optional = true } -- cgit v1.2.3 From 44e75a74bddf5c96d12dfdda18a4d3247a1a3bbf Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Fri, 27 Oct 2017 13:31:01 +0200 Subject: switch to upstream nom --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6d2fe81..02f8968 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,7 @@ hjson = ["serde-hjson"] [dependencies] lazy_static = "0.2" serde = "^1.0.8" -# nom = "^3.0.0" -nom = { git = "https://github.com/snipsco/nom.git", rev = "3769283" } +nom = "^3.2.1" toml = { version = "^0.4.1", optional = true } serde_json = { version = "^1.0.2", optional = true } -- cgit v1.2.3