diff options
author | Geoffroy Couprie <geo.couprie@gmail.com> | 2018-02-17 19:51:50 +0100 |
---|---|---|
committer | Geoffroy Couprie <geo.couprie@gmail.com> | 2018-02-17 19:51:50 +0100 |
commit | e3f25ce0d911aa4a2bc3c4ca32d6ed29c98a4a3d (patch) | |
tree | f062b25c034a36c6bd864283c2a0b5c88814813d /src/path | |
parent | 1e16a3bfb7adab7f5e642759e94fb17cba1ea0bd (diff) |
update to nom 4
Diffstat (limited to 'src/path')
-rw-r--r-- | src/path/parser.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/path/parser.rs b/src/path/parser.rs index 7629193..61fa217 100644 --- a/src/path/parser.rs +++ b/src/path/parser.rs @@ -55,17 +55,17 @@ fn postfix(expr: Expression) -> Box<Fn(&[u8]) -> IResult<&[u8], Expression>> { pub fn from_str(input: &str) -> Result<Expression, ErrorKind> { match ident(input.as_bytes()) { - IResult::Done(mut rem, mut expr) => { + Ok((mut rem, mut expr)) => { while !rem.is_empty() { match postfix(expr)(rem) { - IResult::Done(rem_, expr_) => { + Ok((rem_, expr_)) => { rem = rem_; expr = expr_; } // Forward Incomplete and Error result => { - return result.to_result().map_err(|e| e.into_error_kind()); + return result.map(|(_,o)| o).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().map_err(|e| e.into_error_kind()), + result => result.map(|(_,o)| o).map_err(|e| e.into_error_kind()), } } |