Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,24 +292,15 @@ impl BufferJsonParser {
/// use json_event_parser::{JsonEvent, SliceJsonParser};
/// use std::borrow::Cow;
///
/// let mut reader = SliceJsonParser::new(b"{\"foo\": 1}");
/// assert!(matches!(
/// reader.parse_next(),
/// Some(Ok(JsonEvent::StartObject))
/// ));
/// assert!(matches!(
/// reader.parse_next(),
/// Some(Ok(JsonEvent::ObjectKey(Cow::Borrowed("foo"))))
/// ));
/// assert!(matches!(
/// reader.parse_next(),
/// Some(Ok(JsonEvent::Number(Cow::Borrowed("1"))))
/// ));
/// assert!(matches!(
/// reader.parse_next(),
/// Some(Ok(JsonEvent::EndObject))
/// ));
/// assert!(matches!(reader.parse_next(), None));
/// assert_eq!(
/// SliceJsonParser::new(b"{\"foo\": 1}").collect::<Result<Vec<_>, _>>()?,
/// vec![
/// JsonEvent::StartObject,
/// JsonEvent::ObjectKey(Cow::Borrowed("foo")),
/// JsonEvent::Number(Cow::Borrowed("1")),
/// JsonEvent::EndObject
/// ]
/// );
/// # std::io::Result::Ok(())
/// ```
pub struct SliceJsonParser<'a> {
Expand All @@ -325,9 +316,12 @@ impl<'a> SliceJsonParser<'a> {
parser: LowLevelJsonParser::new(),
}
}
}

#[inline]
pub fn parse_next(&mut self) -> Option<Result<JsonEvent<'a>, JsonSyntaxError>> {
impl<'a> Iterator for SliceJsonParser<'a> {
type Item = Result<JsonEvent<'a>, JsonSyntaxError>;

fn next(&mut self) -> Option<Result<JsonEvent<'a>, JsonSyntaxError>> {
let LowLevelJsonParserResult {
event,
consumed_bytes,
Expand All @@ -337,14 +331,6 @@ impl<'a> SliceJsonParser<'a> {
}
}

impl<'a> Iterator for SliceJsonParser<'a> {
type Item = Result<JsonEvent<'a>, JsonSyntaxError>;

fn next(&mut self) -> Option<Result<JsonEvent<'a>, JsonSyntaxError>> {
self.parse_next()
}
}

/// A low-level JSON parser acting on a provided buffer.
///
/// Does not allocate except a stack to check if array and object opening and closing are properly nested.
Expand Down
2 changes: 1 addition & 1 deletion tests/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn test_error_messages() {
for (json, error) in entries {
assert_eq!(
SliceJsonParser::new(json)
.parse_next()
.next()
.unwrap()
.unwrap_err()
.to_string(),
Expand Down