Skip to content

Commit

Permalink
remove macros from custom error tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nickelc authored and Geal committed Aug 5, 2021
1 parent 9601840 commit 71b9846
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions tests/custom_errors.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#![allow(dead_code)]
#![cfg_attr(feature = "cargo-clippy", allow(block_in_if_condition_stmt))]

#[macro_use]
extern crate nom;

use nom::bytes::streaming::tag;
use nom::character::streaming::digit1 as digit;
use nom::combinator::verify;
use nom::error::{ErrorKind, ParseError};
#[cfg(feature = "alloc")]
use nom::multi::count;
use nom::sequence::terminated;
use nom::IResult;

use std::convert::From;

#[derive(Debug)]
pub struct CustomError(String);

Expand All @@ -31,19 +30,19 @@ impl<'a> ParseError<&'a str> for CustomError {

fn test1(input: &str) -> IResult<&str, &str, CustomError> {
//fix_error!(input, CustomError, tag!("abcd"))
tag!(input, "abcd")
tag("abcd")(input)
}

fn test2(input: &str) -> IResult<&str, &str, CustomError> {
//terminated!(input, test1, fix_error!(CustomError, digit))
terminated!(input, test1, digit)
terminated(test1, digit)(input)
}

fn test3(input: &str) -> IResult<&str, &str, CustomError> {
verify!(input, test1, |s: &str| { s.starts_with("abcd") })
verify(test1, |s: &str| s.starts_with("abcd"))(input)
}

#[cfg(feature = "alloc")]
fn test4(input: &str) -> IResult<&str, Vec<&str>, CustomError> {
count!(input, test1, 4)
count(test1, 4)(input)
}

0 comments on commit 71b9846

Please sign in to comment.