From 6d2e832f804f2d0bbdd1e0065316625834b4d367 Mon Sep 17 00:00:00 2001
From: Thomas Peters <thomas.d.peters@gmail.com>
Date: Tue, 11 Oct 2022 13:16:33 -0400
Subject: [PATCH] rustup 1.63 -> 1.64; clippy

---
 src/bytecode_interpreter.rs |  4 +---
 src/parser.rs               |  8 +++-----
 src/treewalk_interpreter.rs | 12 +++---------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/bytecode_interpreter.rs b/src/bytecode_interpreter.rs
index 844554f..1bbb3d2 100644
--- a/src/bytecode_interpreter.rs
+++ b/src/bytecode_interpreter.rs
@@ -337,9 +337,7 @@ impl Interpreter {
                 return Ok(());
             }
 
-            if let Err(err) = self.step() {
-                return Err(err);
-            }
+            self.step()?;
         }
     }
 
diff --git a/src/parser.rs b/src/parser.rs
index 3540e77..3c3c047 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1,6 +1,6 @@
 use crate::expr;
-use crate::scanner;
 use crate::extensions;
+use crate::scanner;
 
 use std::fmt;
 
@@ -852,12 +852,10 @@ impl Parser {
         }
         if self.matches(scanner::TokenType::LeftParen) {
             let expr = Box::new(self.expression()?);
-            if let Err(err) = self.consume(
+            self.consume(
                 scanner::TokenType::RightParen,
                 "Expected ')' after expression.",
-            ) {
-                return Err(err);
-            }
+            )?;
             return Ok(expr::Expr::Grouping(expr));
         }
         if self.extensions.lists && self.matches(scanner::TokenType::LeftBracket) {
diff --git a/src/treewalk_interpreter.rs b/src/treewalk_interpreter.rs
index abd9e6d..c0cf8d2 100644
--- a/src/treewalk_interpreter.rs
+++ b/src/treewalk_interpreter.rs
@@ -856,9 +856,7 @@ impl Interpreter {
             expr::Expr::Assign(sym, val_expr) => {
                 let val = self.interpret_expr(val_expr)?;
 
-                if let Err(err) = self.env.assign(sym.clone(), &val) {
-                    return Err(err);
-                }
+                self.env.assign(sym.clone(), &val)?;
 
                 Ok(val)
             }
@@ -1267,9 +1265,9 @@ impl Interpreter {
 
 #[cfg(test)]
 mod tests {
+    use crate::extensions;
     use crate::parser;
     use crate::scanner;
-    use crate::extensions;
     use crate::treewalk_interpreter;
 
     fn evaluate(code: &str, options: extensions::Extensions) -> Result<String, String> {
@@ -1335,11 +1333,7 @@ mod tests {
     }
 
     fn check_output_default(code: &str, expected_output: &str) {
-        check_output(
-            code,
-            expected_output,
-            extensions::Extensions::default(),
-        )
+        check_output(code, expected_output, extensions::Extensions::default())
     }
 
     fn check_error(code: &str, f: &dyn Fn(&str) -> ()) {