Enable all clippy warnings
Rename Scanner::next() to Scanner::next_token() to avoid confusiong with the Iterator trait.
This commit is contained in:
parent
a120d93e7d
commit
cccf769b1c
2 changed files with 12 additions and 15 deletions
|
@ -30,9 +30,6 @@
|
||||||
//!
|
//!
|
||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
#![cfg_attr(feature = "cargo-clippy", warn(clippy::pedantic))]
|
|
||||||
#![cfg_attr(feature = "cargo-clippy", allow(clippy::should_implement_trait))]
|
|
||||||
|
|
||||||
extern crate hashlink;
|
extern crate hashlink;
|
||||||
|
|
||||||
pub(crate) mod char_traits;
|
pub(crate) mod char_traits;
|
||||||
|
|
|
@ -224,7 +224,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
if let Some(ref x) = self.current {
|
if let Some(ref x) = self.current {
|
||||||
Ok(x)
|
Ok(x)
|
||||||
} else {
|
} else {
|
||||||
self.current = Some(self.next()?);
|
self.current = Some(self.next_token()?);
|
||||||
self.peek()
|
self.peek()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -232,7 +232,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
/// Try to load the next event and return it, consuming it from `self`.
|
/// Try to load the next event and return it, consuming it from `self`.
|
||||||
/// # Errors
|
/// # Errors
|
||||||
/// Returns `ScanError` when loading the next event fails.
|
/// Returns `ScanError` when loading the next event fails.
|
||||||
pub fn next(&mut self) -> ParseResult {
|
pub fn next_token(&mut self) -> ParseResult {
|
||||||
match self.current.take() {
|
match self.current.take() {
|
||||||
None => self.parse(),
|
None => self.parse(),
|
||||||
Some(v) => Ok(v),
|
Some(v) => Ok(v),
|
||||||
|
@ -311,7 +311,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
multi: bool,
|
multi: bool,
|
||||||
) -> Result<(), ScanError> {
|
) -> Result<(), ScanError> {
|
||||||
if !self.scanner.stream_started() {
|
if !self.scanner.stream_started() {
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
if ev != Event::StreamStart {
|
if ev != Event::StreamStart {
|
||||||
return Err(ScanError::new(mark, "did not find expected <stream-start>"));
|
return Err(ScanError::new(mark, "did not find expected <stream-start>"));
|
||||||
}
|
}
|
||||||
|
@ -324,7 +324,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
loop {
|
loop {
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
if ev == Event::StreamEnd {
|
if ev == Event::StreamEnd {
|
||||||
recv.on_event(ev, mark);
|
recv.on_event(ev, mark);
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
@ -353,11 +353,11 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
}
|
}
|
||||||
recv.on_event(first_ev, mark);
|
recv.on_event(first_ev, mark);
|
||||||
|
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
self.load_node(ev, mark, recv)?;
|
self.load_node(ev, mark, recv)?;
|
||||||
|
|
||||||
// DOCUMENT-END is expected.
|
// DOCUMENT-END is expected.
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
assert_eq!(ev, Event::DocumentEnd);
|
assert_eq!(ev, Event::DocumentEnd);
|
||||||
recv.on_event(ev, mark);
|
recv.on_event(ev, mark);
|
||||||
|
|
||||||
|
@ -391,17 +391,17 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_mapping<R: MarkedEventReceiver>(&mut self, recv: &mut R) -> Result<(), ScanError> {
|
fn load_mapping<R: MarkedEventReceiver>(&mut self, recv: &mut R) -> Result<(), ScanError> {
|
||||||
let (mut key_ev, mut key_mark) = self.next()?;
|
let (mut key_ev, mut key_mark) = self.next_token()?;
|
||||||
while key_ev != Event::MappingEnd {
|
while key_ev != Event::MappingEnd {
|
||||||
// key
|
// key
|
||||||
self.load_node(key_ev, key_mark, recv)?;
|
self.load_node(key_ev, key_mark, recv)?;
|
||||||
|
|
||||||
// value
|
// value
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
self.load_node(ev, mark, recv)?;
|
self.load_node(ev, mark, recv)?;
|
||||||
|
|
||||||
// next event
|
// next event
|
||||||
let (ev, mark) = self.next()?;
|
let (ev, mark) = self.next_token()?;
|
||||||
key_ev = ev;
|
key_ev = ev;
|
||||||
key_mark = mark;
|
key_mark = mark;
|
||||||
}
|
}
|
||||||
|
@ -410,12 +410,12 @@ impl<T: Iterator<Item = char>> Parser<T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_sequence<R: MarkedEventReceiver>(&mut self, recv: &mut R) -> Result<(), ScanError> {
|
fn load_sequence<R: MarkedEventReceiver>(&mut self, recv: &mut R) -> Result<(), ScanError> {
|
||||||
let (mut ev, mut mark) = self.next()?;
|
let (mut ev, mut mark) = self.next_token()?;
|
||||||
while ev != Event::SequenceEnd {
|
while ev != Event::SequenceEnd {
|
||||||
self.load_node(ev, mark, recv)?;
|
self.load_node(ev, mark, recv)?;
|
||||||
|
|
||||||
// next event
|
// next event
|
||||||
let (next_ev, next_mark) = self.next()?;
|
let (next_ev, next_mark) = self.next_token()?;
|
||||||
ev = next_ev;
|
ev = next_ev;
|
||||||
mark = next_mark;
|
mark = next_mark;
|
||||||
}
|
}
|
||||||
|
@ -1057,7 +1057,7 @@ a5: *x
|
||||||
let mut p = Parser::new(s.chars());
|
let mut p = Parser::new(s.chars());
|
||||||
while {
|
while {
|
||||||
let event_peek = p.peek().unwrap().clone();
|
let event_peek = p.peek().unwrap().clone();
|
||||||
let event = p.next().unwrap();
|
let event = p.next_token().unwrap();
|
||||||
assert_eq!(event, event_peek);
|
assert_eq!(event, event_peek);
|
||||||
event.0 != Event::StreamEnd
|
event.0 != Event::StreamEnd
|
||||||
} {}
|
} {}
|
||||||
|
|
Loading…
Reference in a new issue