Update codegen and core for 2018-05-16 nightly.

SergioBenitez · May 17, 2018 · 87dbd39 · 87dbd39
1 parent 44bbca0
commit 87dbd39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs
@@ -314,7 +314,7 @@ fn gen_expr(
             let remake = |new_params| ExprKind::MethodCall(ty, new_params);
             remonad_params(ecx, input, binding, expr, params, false, remake)
         }
-        ExprKind::Block(block) => {
+        ExprKind::Block(block, ..) => {
             let stmt = gen_stmt(ecx, input, VecDeque::from(block.stmts.clone()));
             quote_expr!(ecx, { $stmt })
         }

diff --git a/examples/json/src/main.rs b/examples/json/src/main.rs
@@ -29,7 +29,7 @@ fn is_whitespace(c: char) -> bool {
 
 #[parser]
 fn int<'a, I: StrLikeInput<'a>>(input: &mut I) -> ParseResult<I, i64> {
-    from!(take_some_while(|c| ('0'..='9').contains(c)).parse()) // NOT BENCH
+    from!(take_some_while(|c| ('0'..='9').contains(&c)).parse()) // NOT BENCH
     // take_some_while(|c| ('0'..='9').contains(c)); // BENCH
     // 1 // BENCH
 }
@@ -44,7 +44,7 @@ fn signed_int<'a, I: StrLikeInput<'a>>(input: &mut I) -> ParseResult<I, i64> {
 #[parser]
 fn number<'a, I: StrLikeInput<'a>>(input: &mut I) -> ParseResult<I, f64> {
     let whole_num = signed_int();
-    let frac = switch! { eat('.') => take_some_while(|c| ('0'..='9').contains(c)), _ => "" };
+    let frac = switch! { eat('.') => take_some_while(|c| ('0'..='9').contains(&c)), _ => "" };
     let exp = switch! { eat_if(|c| "eE".contains(c)) => signed_int(), _ => 0 };
     from!(format!("{}.{}e{}", whole_num, frac, exp).parse()) // NOT BENCH
     // 0.0 // BENCH
@@ -100,7 +100,7 @@ fn value<'a, I: StrLikeInput<'a>>(input: &mut I) -> ParseResult<I, JsonValue<'a>
         peek('{') => JsonValue::Object(object()),
         peek('[') => JsonValue::Array(array()),
         peek('"') => JsonValue::String(string()),
-        peek_if(|c| c == '-' || ('0'..='9').contains(c)) => JsonValue::Number(number())
+        peek_if(|c| c == '-' || ('0'..='9').contains(&c)) => JsonValue::Number(number())
     };
 
     skip_while(is_whitespace);