Skip to content

Commit dc25dbf

Browse files
authored
Merge pull request #720 from epage/token
feat(stream)!: Add `TokenSlice` to make parsing lexed tokens easier
2 parents b5d4276 + f76d81f commit dc25dbf

File tree

10 files changed

+486
-145
lines changed

10 files changed

+486
-145
lines changed

src/ascii/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl Caseless<&str> {
9292
/// # use winnow::ascii::crlf;
9393
/// assert_eq!(crlf::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\r\nc")), Ok((Partial::new("c"), "\r\n")));
9494
/// assert!(crlf::<_, ErrMode<ContextError>>.parse_peek(Partial::new("ab\r\nc")).is_err());
95-
/// assert_eq!(crlf::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(2))));
95+
/// assert_eq!(crlf::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::Unknown)));
9696
/// ```
9797
#[inline(always)]
9898
pub fn crlf<Input, Error>(input: &mut Input) -> Result<<Input as Stream>::Slice, Error>
@@ -238,7 +238,7 @@ where
238238
/// # use winnow::ascii::line_ending;
239239
/// assert_eq!(line_ending::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\r\nc")), Ok((Partial::new("c"), "\r\n")));
240240
/// assert!(line_ending::<_, ErrMode<ContextError>>.parse_peek(Partial::new("ab\r\nc")).is_err());
241-
/// assert_eq!(line_ending::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
241+
/// assert_eq!(line_ending::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::Unknown)));
242242
/// ```
243243
#[inline(always)]
244244
pub fn line_ending<Input, Error>(input: &mut Input) -> Result<<Input as Stream>::Slice, Error>
@@ -287,7 +287,7 @@ where
287287
/// # use winnow::ascii::newline;
288288
/// assert_eq!(newline::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\nc")), Ok((Partial::new("c"), '\n')));
289289
/// assert!(newline::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\r\nc")).is_err());
290-
/// assert_eq!(newline::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
290+
/// assert_eq!(newline::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::Unknown)));
291291
/// ```
292292
#[inline(always)]
293293
pub fn newline<I, Error: ParserError<I>>(input: &mut I) -> Result<char, Error>
@@ -337,7 +337,7 @@ where
337337
/// # use winnow::ascii::tab;
338338
/// assert_eq!(tab::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\tc")), Ok((Partial::new("c"), '\t')));
339339
/// assert!(tab::<_, ErrMode<ContextError>>.parse_peek(Partial::new("\r\nc")).is_err());
340-
/// assert_eq!(tab::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::new(1))));
340+
/// assert_eq!(tab::<_, ErrMode<ContextError>>.parse_peek(Partial::new("")), Err(ErrMode::Incomplete(Needed::Unknown)));
341341
/// ```
342342
#[inline(always)]
343343
pub fn tab<Input, Error>(input: &mut Input) -> Result<char, Error>

src/ascii/tests.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -4123,9 +4123,7 @@ Ok(
41234123
str![[r#"
41244124
Err(
41254125
Incomplete(
4126-
Size(
4127-
1,
4128-
),
4126+
Unknown,
41294127
),
41304128
)
41314129
@@ -4174,9 +4172,7 @@ Ok(
41744172
str![[r#"
41754173
Err(
41764174
Incomplete(
4177-
Size(
4178-
1,
4179-
),
4175+
Unknown,
41804176
),
41814177
)
41824178
@@ -4250,9 +4246,7 @@ Ok(
42504246
str![[r#"
42514247
Err(
42524248
Incomplete(
4253-
Size(
4254-
1,
4255-
),
4249+
Unknown,
42564250
),
42574251
)
42584252
@@ -4317,9 +4311,7 @@ Ok(
43174311
str![[r#"
43184312
Err(
43194313
Incomplete(
4320-
Size(
4321-
1,
4322-
),
4314+
Unknown,
43234315
),
43244316
)
43254317

src/binary/tests.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -3212,9 +3212,7 @@ Ok(
32123212
str![[r#"
32133213
Err(
32143214
Incomplete(
3215-
Size(
3216-
1,
3217-
),
3215+
Unknown,
32183216
),
32193217
)
32203218
@@ -3226,9 +3224,7 @@ Err(
32263224
str![[r#"
32273225
Err(
32283226
Incomplete(
3229-
Size(
3230-
1,
3231-
),
3227+
Unknown,
32323228
),
32333229
)
32343230

0 commit comments

Comments
 (0)