From 50f586844c096d98a7d5b07332a6a77dac4ec933 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 10 Sep 2019 17:34:59 +0200 Subject: Rename various bits of the pest_consume API --- dhall_syntax/src/parser.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dhall_syntax') diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs index 0d529bc..74d2731 100644 --- a/dhall_syntax/src/parser.rs +++ b/dhall_syntax/src/parser.rs @@ -6,7 +6,7 @@ use std::rc::Rc; use dgp::Rule; use dhall_generated_parser as dgp; -use pest_consume::{make_parser, match_inputs, PestConsumer}; +use pest_consume::{match_inputs, Parser}; use crate::map::{DupTreeMap, DupTreeSet}; use crate::ExprF::*; @@ -20,7 +20,7 @@ use crate::*; type ParsedText = InterpolatedText>; type ParsedTextContents = InterpolatedTextContents>; type ParseInput<'input, 'data> = - pest_consume::ParseInput<'input, 'data, Rule, Rc>; + pest_consume::Node<'input, 'data, Rule, Rc>; pub type ParseError = pest::error::Error; pub type ParseResult = Result; @@ -150,7 +150,7 @@ lazy_static::lazy_static! { struct DhallParser; -#[make_parser(dgp::DhallParser, dgp::Rule)] +#[pest_consume::parser(dgp::DhallParser, dgp::Rule)] impl DhallParser { fn EOI(_input: ParseInput) -> ParseResult<()> { Ok(()) -- cgit v1.2.3