From 04f8b99f49cde08d53ac1d024b12cac3ded35798 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Sun, 17 Mar 2024 02:47:41 -0700
Subject: [PATCH] Enable the redundant-else clippy checks

---
 saphyr/src/lib.rs     |  1 -
 saphyr/src/parser.rs  | 31 ++++++++++++++-----------------
 saphyr/src/scanner.rs |  5 ++---
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/saphyr/src/lib.rs b/saphyr/src/lib.rs
index 5c5ca2b..c0ef93b 100644
--- a/saphyr/src/lib.rs
+++ b/saphyr/src/lib.rs
@@ -37,7 +37,6 @@
         clippy::should_implement_trait,
         clippy::missing_errors_doc,
         clippy::missing_panics_doc,
-        clippy::redundant_else,
     )
 )]
 
diff --git a/saphyr/src/parser.rs b/saphyr/src/parser.rs
index a6e40b8..5f65785 100644
--- a/saphyr/src/parser.rs
+++ b/saphyr/src/parser.rs
@@ -617,9 +617,8 @@ impl<T: Iterator<Item = char>> Parser<T> {
                         }
                         Some(id) => return Ok((Event::Alias(*id), mark)),
                     }
-                } else {
-                    unreachable!()
                 }
+                unreachable!()
             }
             Token(_, TokenType::Anchor(_)) => {
                 if let Token(mark, TokenType::Anchor(name)) = self.fetch_token() {
@@ -782,10 +781,9 @@ impl<T: Iterator<Item = char>> Parser<T> {
                             {
                                 self.state = State::FlowMappingValue;
                                 return Ok((Event::empty_scalar(), mark));
-                            } else {
-                                self.push_state(State::FlowMappingValue);
-                                return self.parse_node(false, false);
                             }
+                            self.push_state(State::FlowMappingValue);
+                            return self.parse_node(false, false);
                         }
                         Token(marker, TokenType::Value) => {
                             self.state = State::FlowMappingValue;
@@ -814,21 +812,20 @@ impl<T: Iterator<Item = char>> Parser<T> {
                 let Token(mark, _) = *self.peek_token()?;
                 self.state = State::FlowMappingKey;
                 return Ok((Event::empty_scalar(), mark));
-            } else {
-                match *self.peek_token()? {
-                    Token(marker, TokenType::Value) => {
-                        self.skip();
-                        match self.peek_token()?.1 {
-                            TokenType::FlowEntry | TokenType::FlowMappingEnd => {}
-                            _ => {
-                                self.push_state(State::FlowMappingKey);
-                                return self.parse_node(false, false);
-                            }
+            }
+            match *self.peek_token()? {
+                Token(marker, TokenType::Value) => {
+                    self.skip();
+                    match self.peek_token()?.1 {
+                        TokenType::FlowEntry | TokenType::FlowMappingEnd => {}
+                        _ => {
+                            self.push_state(State::FlowMappingKey);
+                            return self.parse_node(false, false);
                         }
-                        marker
                     }
-                    Token(marker, _) => marker,
+                    marker
                 }
+                Token(marker, _) => marker,
             }
         };
 
diff --git a/saphyr/src/scanner.rs b/saphyr/src/scanner.rs
index 226f801..cd96ad4 100644
--- a/saphyr/src/scanner.rs
+++ b/saphyr/src/scanner.rs
@@ -2435,10 +2435,9 @@ impl<T: Iterator<Item = char>> Scanner<T> {
         while let Some(indent) = self.indents.last() {
             if indent.needs_block_end {
                 break;
-            } else {
-                self.indent = indent.indent;
-                self.indents.pop();
             }
+            self.indent = indent.indent;
+            self.indents.pop();
         }
     }