Skip to content

Commit bd1adeb

Browse files
GealGeal
committedNov 24, 2020
fmt
·
6.0.1
1 parent 36fabd7 commit bd1adeb

File tree

7 files changed

+76
-34
lines changed

7 files changed

+76
-34
lines changed
 

‎src/character/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ pub fn is_space(chr: u8) -> bool {
113113
#[inline]
114114
pub fn is_newline(chr: u8) -> bool {
115115
chr == b'\n'
116-
}
116+
}

‎src/internal.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ pub trait Finish<I, O, E> {
3535
impl<I, O, E> Finish<I, O, E> for IResult<I, O, E> {
3636
fn finish(self) -> Result<(I, O), E> {
3737
match self {
38-
Ok(res) => Ok(res),
39-
Err(Err::Error(e)) | Err(Err::Failure(e)) => Err(e),
40-
Err(Err::Incomplete(_)) => {
41-
panic!("Cannot call `finish()` on `Err(Err::Incomplete(_))`: this result means that the parser does not have enough data to decide, you should gather more data and try to reapply the parser instead")
42-
}
43-
}
38+
Ok(res) => Ok(res),
39+
Err(Err::Error(e)) | Err(Err::Failure(e)) => Err(e),
40+
Err(Err::Incomplete(_)) => {
41+
panic!("Cannot call `finish()` on `Err(Err::Incomplete(_))`: this result means that the parser does not have enough data to decide, you should gather more data and try to reapply the parser instead")
42+
}
43+
}
4444
}
4545
}
4646

‎src/multi/macros.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,10 @@ mod tests {
614614
let i_err_pos = &i[3..];
615615
assert_eq!(
616616
empty_sep(i),
617-
Err(Err::Error(error_position!(i_err_pos, ErrorKind::SeparatedList)))
617+
Err(Err::Error(error_position!(
618+
i_err_pos,
619+
ErrorKind::SeparatedList
620+
)))
618621
);
619622
let res4 = vec![&b"abcd"[..], &b"abcd"[..]];
620623
assert_eq!(multi(e), Ok((&b",ef"[..], res4)));

‎src/multi/mod.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,11 @@ where
726726
/// assert_eq!(parser("123123"), Ok(("123123", vec![])));
727727
/// assert_eq!(parser(""), Ok(("", vec![])));
728728
/// ```
729-
pub fn fold_many0<I, O, E, F, G, R>(mut f: F, init: R, mut g: G) -> impl FnMut(I) -> IResult<I, R, E>
729+
pub fn fold_many0<I, O, E, F, G, R>(
730+
mut f: F,
731+
init: R,
732+
mut g: G,
733+
) -> impl FnMut(I) -> IResult<I, R, E>
730734
where
731735
I: Clone + PartialEq,
732736
F: Parser<I, O, E>,
@@ -804,7 +808,11 @@ where
804808
/// assert_eq!(parser("123123"), Err(Err::Error(Error::new("123123", ErrorKind::Many1))));
805809
/// assert_eq!(parser(""), Err(Err::Error(Error::new("", ErrorKind::Many1))));
806810
/// ```
807-
pub fn fold_many1<I, O, E, F, G, R>(mut f: F, init: R, mut g: G) -> impl FnMut(I) -> IResult<I, R, E>
811+
pub fn fold_many1<I, O, E, F, G, R>(
812+
mut f: F,
813+
init: R,
814+
mut g: G,
815+
) -> impl FnMut(I) -> IResult<I, R, E>
808816
where
809817
I: Clone + PartialEq,
810818
F: Parser<I, O, E>,

‎src/regexp/macros.rs

+24-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ macro_rules! re_bytes_find (
5555
///
5656
/// Requires the `regexp` feature.
5757
#[macro_export(local_inner_macros)]
58-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
58+
#[cfg_attr(
59+
feature = "docsrs",
60+
doc(cfg(all(feature = "regexp", feature = "alloc")))
61+
)]
5962
macro_rules! re_matches (
6063
($i:expr, $re:expr) => ( {
6164
let r = $crate::lib::regex::Regex::new($re).unwrap();
@@ -68,7 +71,10 @@ macro_rules! re_matches (
6871
///
6972
/// Requires the `regexp` feature.
7073
#[macro_export(local_inner_macros)]
71-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
74+
#[cfg_attr(
75+
feature = "docsrs",
76+
doc(cfg(all(feature = "regexp", feature = "alloc")))
77+
)]
7278
macro_rules! re_bytes_matches (
7379
($i:expr, $re:expr) => ( {
7480
let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
@@ -81,7 +87,10 @@ macro_rules! re_bytes_matches (
8187
///
8288
/// Requires the `regexp` feature.
8389
#[macro_export(local_inner_macros)]
84-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
90+
#[cfg_attr(
91+
feature = "docsrs",
92+
doc(cfg(all(feature = "regexp", feature = "alloc")))
93+
)]
8594
macro_rules! re_capture (
8695
($i:expr, $re:expr) => ( {
8796
let r = $crate::lib::regex::Regex::new($re).unwrap();
@@ -94,7 +103,10 @@ macro_rules! re_capture (
94103
///
95104
/// Requires the `regexp` feature.
96105
#[macro_export(local_inner_macros)]
97-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
106+
#[cfg_attr(
107+
feature = "docsrs",
108+
doc(cfg(all(feature = "regexp", feature = "alloc")))
109+
)]
98110
macro_rules! re_bytes_capture (
99111
($i:expr, $re:expr) => ( {
100112
let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();
@@ -108,7 +120,10 @@ macro_rules! re_bytes_capture (
108120
///
109121
/// Requires the `regexp` feature.
110122
#[macro_export(local_inner_macros)]
111-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
123+
#[cfg_attr(
124+
feature = "docsrs",
125+
doc(cfg(all(feature = "regexp", feature = "alloc")))
126+
)]
112127
macro_rules! re_captures (
113128
($i:expr, $re:expr) => ( {
114129
let r = $crate::lib::regex::Regex::new($re).unwrap();
@@ -121,7 +136,10 @@ macro_rules! re_captures (
121136
///
122137
/// Requires the `regexp` feature.
123138
#[macro_export(local_inner_macros)]
124-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
139+
#[cfg_attr(
140+
feature = "docsrs",
141+
doc(cfg(all(feature = "regexp", feature = "alloc")))
142+
)]
125143
macro_rules! re_bytes_captures (
126144
($i:expr, $re:expr) => ( {
127145
let r = $crate::lib::regex::bytes::Regex::new($re).unwrap();

‎src/regexp/mod.rs

+24-6
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ pub mod str {
5959
/// # }
6060
/// ```
6161
#[cfg(all(feature = "regexp", feature = "alloc"))]
62-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
62+
#[cfg_attr(
63+
feature = "docsrs",
64+
doc(cfg(all(feature = "regexp", feature = "alloc")))
65+
)]
6366
pub fn re_matches<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<&'a str>, E>
6467
where
6568
E: ParseError<&'a str>,
@@ -130,7 +133,10 @@ pub mod str {
130133
/// # }
131134
/// ```
132135
#[cfg(all(feature = "regexp", feature = "alloc"))]
133-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
136+
#[cfg_attr(
137+
feature = "docsrs",
138+
doc(cfg(all(feature = "regexp", feature = "alloc")))
139+
)]
134140
pub fn re_capture<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<&'a str>, E>
135141
where
136142
E: ParseError<&'a str>,
@@ -171,7 +177,10 @@ pub mod str {
171177
/// # }
172178
/// ```
173179
#[cfg(all(feature = "regexp", feature = "alloc"))]
174-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
180+
#[cfg_attr(
181+
feature = "docsrs",
182+
doc(cfg(all(feature = "regexp", feature = "alloc")))
183+
)]
175184
pub fn re_captures<'a, E>(re: Regex) -> impl Fn(&'a str) -> IResult<&'a str, Vec<Vec<&'a str>>, E>
176185
where
177186
E: ParseError<&'a str>,
@@ -361,7 +370,10 @@ pub mod bytes {
361370
/// # }
362371
/// ```
363372
#[cfg(all(feature = "regexp", feature = "alloc"))]
364-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
373+
#[cfg_attr(
374+
feature = "docsrs",
375+
doc(cfg(all(feature = "regexp", feature = "alloc")))
376+
)]
365377
pub fn re_matches<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<&'a [u8]>, E>
366378
where
367379
E: ParseError<&'a [u8]>,
@@ -431,7 +443,10 @@ pub mod bytes {
431443
/// # }
432444
/// ```
433445
#[cfg(all(feature = "regexp", feature = "alloc"))]
434-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
446+
#[cfg_attr(
447+
feature = "docsrs",
448+
doc(cfg(all(feature = "regexp", feature = "alloc")))
449+
)]
435450
pub fn re_capture<'a, E>(re: Regex) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<&'a [u8]>, E>
436451
where
437452
E: ParseError<&'a [u8]>,
@@ -472,7 +487,10 @@ pub mod bytes {
472487
/// # }
473488
/// ```
474489
#[cfg(all(feature = "regexp", feature = "alloc"))]
475-
#[cfg_attr(feature = "docsrs", doc(cfg(all(feature = "regexp", feature = "alloc"))))]
490+
#[cfg_attr(
491+
feature = "docsrs",
492+
doc(cfg(all(feature = "regexp", feature = "alloc")))
493+
)]
476494
pub fn re_captures<'a, E>(
477495
re: Regex,
478496
) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], Vec<Vec<&'a [u8]>>, E>

‎tests/issues.rs

+7-12
Original file line numberDiff line numberDiff line change
@@ -350,16 +350,11 @@ named!(issue_962<&[u8], Vec<&[u8]>>,
350350

351351
#[test]
352352
fn issue_1231_bits_expect_fn_closure() {
353-
use nom::bits::{bits, complete::take};
354-
use nom::error::Error;
355-
use nom::sequence::tuple;
356-
pub fn example(input: &[u8]) -> IResult<&[u8], (u8, u8)> {
357-
bits::<_, _, Error<_>, _, _>(tuple((
358-
take(1usize), take(1usize)
359-
)))(input)
360-
}
361-
assert_eq!(
362-
example(&[0xff]),
363-
Ok((&b""[..], (1, 1)))
364-
);
353+
use nom::bits::{bits, complete::take};
354+
use nom::error::Error;
355+
use nom::sequence::tuple;
356+
pub fn example(input: &[u8]) -> IResult<&[u8], (u8, u8)> {
357+
bits::<_, _, Error<_>, _, _>(tuple((take(1usize), take(1usize))))(input)
358+
}
359+
assert_eq!(example(&[0xff]), Ok((&b""[..], (1, 1))));
365360
}

0 commit comments

Comments
 (0)
Please sign in to comment.