arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable the redundant-else clippy checks

Browse source
This commit is contained in:
David Aguilar 2024-03-17 02:47:41 -07:00 committed by Ethiraric
parent b2bed366cf
commit a42f26b306
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
parser/src/lib.rs
View file

@ -37,7 +37,6 @@
clippy::should_implement_trait, clippy::should_implement_trait,
clippy::missing_errors_doc, clippy::missing_errors_doc,
clippy::missing_panics_doc, clippy::missing_panics_doc,
clippy::redundant_else,
) )
)] )]

9
parser/src/parser.rs
View file

@ -617,9 +617,8 @@ impl<T: Iterator<Item = char>> Parser<T> {
} }
Some(id) => return Ok((Event::Alias(*id), mark)), Some(id) => return Ok((Event::Alias(*id), mark)),
} }
} else {
unreachable!()
} }
unreachable!()
} }
Token(_, TokenType::Anchor(_)) => { Token(_, TokenType::Anchor(_)) => {
if let Token(mark, TokenType::Anchor(name)) = self.fetch_token() { if let Token(mark, TokenType::Anchor(name)) = self.fetch_token() {
@ -782,11 +781,10 @@ impl<T: Iterator<Item = char>> Parser<T> {
{ {
self.state = State::FlowMappingValue; self.state = State::FlowMappingValue;
return Ok((Event::empty_scalar(), mark)); return Ok((Event::empty_scalar(), mark));
} else { }
self.push_state(State::FlowMappingValue); self.push_state(State::FlowMappingValue);
return self.parse_node(false, false); return self.parse_node(false, false);
} }
}
Token(marker, TokenType::Value) => { Token(marker, TokenType::Value) => {
self.state = State::FlowMappingValue; self.state = State::FlowMappingValue;
return Ok((Event::empty_scalar(), marker)); return Ok((Event::empty_scalar(), marker));
@ -814,7 +812,7 @@ impl<T: Iterator<Item = char>> Parser<T> {
let Token(mark, _) = *self.peek_token()?; let Token(mark, _) = *self.peek_token()?;
self.state = State::FlowMappingKey; self.state = State::FlowMappingKey;
return Ok((Event::empty_scalar(), mark)); return Ok((Event::empty_scalar(), mark));
} else { }
match *self.peek_token()? { match *self.peek_token()? {
Token(marker, TokenType::Value) => { Token(marker, TokenType::Value) => {
self.skip(); self.skip();
@ -829,7 +827,6 @@ impl<T: Iterator<Item = char>> Parser<T> {
} }
Token(marker, _) => marker, Token(marker, _) => marker,
} }
}
}; };
self.state = State::FlowMappingKey; self.state = State::FlowMappingKey;

3
parser/src/scanner.rs
View file

@ -2435,12 +2435,11 @@ impl<T: Iterator<Item = char>> Scanner<T> {
while let Some(indent) = self.indents.last() { while let Some(indent) = self.indents.last() {
if indent.needs_block_end { if indent.needs_block_end {
break; break;
} else { }
self.indent = indent.indent; self.indent = indent.indent;
self.indents.pop(); self.indents.pop();
} }
} }
}
/// Mark the next token to be inserted as a potential simple key. /// Mark the next token to be inserted as a potential simple key.
fn save_simple_key(&mut self) { fn save_simple_key(&mut self) {