chore: Fix clippy issues

Author: lucidLuckylee

src/analyzer.rs

@@ -26,11 +26,9 @@ impl StackStatus {
             && self.deepest_altstack_accessed == 0
             && self.deepest_stack_accessed == 0
     }
-    
+
     pub fn is_valid_final_state_with_inputs(&self) -> bool {
-        self.stack_changed == 1
-            && self.altstack_changed == 0
-            && self.deepest_altstack_accessed == 0
+        self.stack_changed == 1 && self.altstack_changed == 0 && self.deepest_altstack_accessed == 0
     }
 }
 
@@ -321,18 +319,11 @@ impl StackAnalyzer {
     }
 
     fn stack_change(&mut self, stack_status: StackStatus) {
-        let status;
-        match self.if_stack.last_mut() {
-            None => {
-                status = self.stack_status.borrow_mut();
-            }
-            Some(IfStackEle::IfFlow(stack_status)) => {
-                status = stack_status.borrow_mut();
-            }
-            Some(IfStackEle::ElseFlow((_, stack_status))) => {
-                status = stack_status.borrow_mut();
-            }
-        }
+        let status = match self.if_stack.last_mut() {
+            None => self.stack_status.borrow_mut(),
+            Some(IfStackEle::IfFlow(stack_status)) => stack_status.borrow_mut(),
+            Some(IfStackEle::ElseFlow((_, stack_status))) => stack_status.borrow_mut(),
+        };
         let i = status.deepest_stack_accessed.borrow_mut();
         let j = status.stack_changed.borrow_mut();
         let x = status.deepest_altstack_accessed.borrow_mut();

src/builder.rs

@@ -150,10 +150,7 @@ impl StructuredScript {
 
     fn get_script_block(&mut self) -> &mut ScriptBuf {
         // Check if the last block is a Script block
-        let is_script_block = match self.blocks.last_mut() {
-            Some(Block::Script(_)) => true,
-            _ => false,
-        };
+        let is_script_block = matches!(self.blocks.last_mut(), Some(Block::Script(_)));
 
         // Create a new Script block if necessary
         if !is_script_block {
@@ -385,23 +382,20 @@ impl StructuredScript {
         (chunk_sizes, scripts)
     }
 
-    pub fn analyze_stack(mut self) -> StackStatus {
+    pub fn analyze_stack(self) -> StackStatus {
         match self.stack_hint {
             Some(hint) => hint,
             None => {
                 let mut analyzer = StackAnalyzer::new();
-                analyzer.analyze_status(&mut self)
+                analyzer.analyze_status(&self)
             }
         }
     }
 
     pub fn get_stack(&self, analyzer: &mut StackAnalyzer) -> StackStatus {
         match &self.stack_hint {
             Some(x) => x.clone(),
-            None => {
-                
-                analyzer.analyze_status(self)
-            }
+            None => analyzer.analyze_status(self),
         }
     }
 

src/chunker.rs

@@ -129,9 +129,7 @@ impl Chunk {
     }
 
     pub fn total_stack_size(&self) -> usize {
-        (self.stats.stack_output_size)
-            .try_into()
-            .expect("Chunk stack size negative at the end. This is a bug.")
+        self.stats.stack_output_size
     }
 }
 
@@ -241,12 +239,7 @@ impl Chunker {
         let max_depth = 8;
         let mut depth = 0;
 
-        loop {
-            let builder = match self.call_stack.pop() {
-                Some(builder) => *builder,
-                None => break,
-            };
-
+        while let Some(builder) = self.call_stack.pop() {
             assert!(
                 undo_info.num_unclosed_ifs + builder.num_unclosed_ifs() >= 0,
                 "More OP_ENDIF's than OP_IF's in the script. num_unclosed_if: {:?} at positions: {:?}",
@@ -259,7 +252,7 @@ impl Chunker {
             if chunk_len + block_len <= self.target_chunk_size {
                 // Adding the current builder remains a valid solution regarding chunk size.
                 chunk_len += block_len;
-                undo_info.update(builder);
+                undo_info.update(*builder);
                 if undo_info.valid(self.stack_limit) {
                     // We will keep all the structured scripts in undo_info in the chunk.
                     chunk_scripts.extend(undo_info.reset());
@@ -276,7 +269,7 @@ impl Chunker {
 
                 // Don't split up script_bufs and scripts that have a (manually set) stack hint.
                 if builder.is_script_buf() || builder.has_stack_hint() {
-                    self.call_stack.push(Box::new(builder));
+                    self.call_stack.push(builder);
                     break;
                 }
                 let mut contains_call = false;
@@ -302,7 +295,7 @@ impl Chunker {
                 );
                 depth += 1;
             } else {
-                self.call_stack.push(Box::new(builder));
+                self.call_stack.push(builder);
                 break;
             }
         }