From fa3193ea50bea5d7f5f758070d14c67b54008991 Mon Sep 17 00:00:00 2001
From: imxyy_soope_ <imxyy1soope1@gmail.com>
Date: Sat, 10 May 2025 16:34:41 +0800
Subject: [PATCH] chore: clippy

---
 src/bin/repl-vm.rs         | 2 +-
 src/ir.rs                  | 3 +--
 src/ty/internal/attrset.rs | 6 +++---
 src/ty/internal/func.rs    | 2 +-
 src/ty/internal/list.rs    | 2 +-
 src/ty/internal/mod.rs     | 2 --
 src/vm/env.rs              | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/bin/repl-vm.rs b/src/bin/repl-vm.rs
index 62ae81f..c1e1a51 100644
--- a/src/bin/repl-vm.rs
+++ b/src/bin/repl-vm.rs
@@ -42,7 +42,7 @@ fn main() -> Result<()> {
                 break;
             }
             Err(err) => {
-                println!("Error: {:?}", err);
+                println!("Error: {err:?}");
                 break;
             }
         }
diff --git a/src/ir.rs b/src/ir.rs
index 8121aa9..a13a43f 100644
--- a/src/ir.rs
+++ b/src/ir.rs
@@ -342,7 +342,7 @@ impl Downgrade for Expr {
         match self {
             Expr::Apply(apply) => apply.downgrade(state),
             Expr::Assert(assert) => assert.downgrade(state),
-            Expr::Error(error) => return Err(Error::DowngradeError(error.to_string())),
+            Expr::Error(error) => Err(Error::DowngradeError(error.to_string())),
             Expr::IfElse(ifelse) => ifelse.downgrade(state),
             Expr::Select(select) => select.downgrade(state),
             Expr::Str(str) => str.downgrade(state),
@@ -391,7 +391,6 @@ impl Downgrade for ast::Path {
     fn downgrade(self, state: &mut DowngradeState) -> Result<Ir> {
         let parts = self
             .parts()
-            .into_iter()
             .map(|part| match part {
                 ast::InterpolPart::Literal(lit) => Const {
                     value: lit.to_string().into(),
diff --git a/src/ty/internal/attrset.rs b/src/ty/internal/attrset.rs
index 8943c76..9b8fbe9 100644
--- a/src/ty/internal/attrset.rs
+++ b/src/ty/internal/attrset.rs
@@ -28,7 +28,7 @@ impl AttrSet {
     }
 
     pub fn push_attr(&mut self, sym: Symbol, val: Value) {
-        if let Some(_) = self.data.get_mut(&sym) {
+        if self.data.get_mut(&sym).is_some() {
             todo!()
         }
         self.data.insert_mut(sym, val);
@@ -72,7 +72,7 @@ impl AttrSet {
             .collect();
         map.iter_mut()
             .map(|(_, v)| v.force_deep(vm).map(|_| ()))
-            .find(|v| matches!(v, Err(_)))
+            .find(|v| v.is_err())
             .map_or(Ok(()), |err| err)?;
         self.data = map.into_iter().collect();
         Ok(())
@@ -159,7 +159,7 @@ impl RecAttrSet {
             .collect();
         map.iter_mut()
             .map(|(_, v)| v.force_deep(vm).map(|_| ()))
-            .find(|v| matches!(v, Err(_)))
+            .find(|v| v.is_err())
             .map_or(Ok(()), |err| err)?;
         *self.data.borrow_mut() = map.into_iter().collect();
         Ok(())
diff --git a/src/ty/internal/func.rs b/src/ty/internal/func.rs
index 0b0ec4c..a2d8f6e 100644
--- a/src/ty/internal/func.rs
+++ b/src/ty/internal/func.rs
@@ -60,7 +60,7 @@ impl Func {
                 for (formal, default) in formals {
                     let arg = arg
                         .select(formal.clone().into())
-                        .or_else(|| default.map(|thunk| Value::Thunk(thunk)))
+                        .or_else(|| default.map(Value::Thunk))
                         .unwrap();
                     new.insert_mut(formal.into(), arg);
                 }
diff --git a/src/ty/internal/list.rs b/src/ty/internal/list.rs
index fa5400e..671c7ee 100644
--- a/src/ty/internal/list.rs
+++ b/src/ty/internal/list.rs
@@ -34,7 +34,7 @@ impl List {
         let mut vec: Vec<_> = self.data.iter().cloned().collect();
         vec.iter_mut()
             .map(|v| v.force_deep(vm).map(|_| ()))
-            .find(|v| matches!(v, Err(_)))
+            .find(|v| v.is_err())
             .map_or(Ok(()), |err| err)?;
         self.data = vec.into_iter().collect();
         Ok(())
diff --git a/src/ty/internal/mod.rs b/src/ty/internal/mod.rs
index 7afa5c5..d68d700 100644
--- a/src/ty/internal/mod.rs
+++ b/src/ty/internal/mod.rs
@@ -25,7 +25,6 @@ pub use cnst::Const;
 pub use func::*;
 pub use list::List;
 pub use primop::*;
-pub use string::ContextfulString;
 
 pub trait ToPublic {
     fn to_public(self, vm: &VM) -> p::Value;
@@ -415,7 +414,6 @@ impl Value {
 
     pub fn coerce_to_string(&mut self) -> &mut Self {
         if let VmConst(Const::String(_)) = self {
-            ()
         } else {
             todo!()
         }
diff --git a/src/vm/env.rs b/src/vm/env.rs
index f0fd9e7..c252be1 100644
--- a/src/vm/env.rs
+++ b/src/vm/env.rs
@@ -67,7 +67,7 @@ impl Env {
     }
 
     pub fn leave(&self) {
-        let last = std::mem::replace(&mut *self.last.borrow_mut(), None).unwrap();
+        let last = (*self.last.borrow_mut()).take().unwrap();
         let _ = std::mem::replace(&mut *self.last.borrow_mut(), last.last.borrow().clone());
         let map = last.map.borrow().clone();
         *self.map.borrow_mut() = map;