Run clippy

Author: lucidLuckylee

src/builder.rs

@@ -22,9 +22,7 @@ thread_local! {
 pub(crate) fn thread_add_script(id: u64, script: StructuredScript) {
     SCRIPT_MAP.with(|script_map| {
         let mut map = script_map.write().unwrap();
-        if !map.contains_key(&id) {
-            map.insert(id, Box::new(script));
-        }
+        map.entry(id).or_insert_with(|| Box::new(script));
     });
 }
 
@@ -119,7 +117,7 @@ impl StructuredScript {
     }
 
     pub fn has_stack_hint(&self) -> bool {
-        self.stack_hint != None
+        self.stack_hint.is_some()
     }
 
     pub fn num_unclosed_ifs(&self) -> i32 {
@@ -401,8 +399,8 @@ impl StructuredScript {
         match &self.stack_hint {
             Some(x) => x.clone(),
             None => {
-                let stack_status = analyzer.analyze_status(self);
-                stack_status
+                
+                analyzer.analyze_status(self)
             }
         }
     }

src/chunker.rs

@@ -101,7 +101,7 @@ impl UndoInfo {
                 return true;
             }
         }
-        return false;
+        false
     }
 }
 
@@ -318,10 +318,12 @@ impl Chunker {
                 .try_into()
                 .expect("Consuming more stack elements than there are on the stack 3"),
             altstack_input_size: input_altstack_size,
-            altstack_output_size: status.altstack_changed.try_into().expect(&format!(
-                "Consuming more stack elements than there are on the altstack: {:?}",
-                status
-            )),
+            altstack_output_size: status.altstack_changed.try_into().unwrap_or_else(|_| {
+                panic!(
+                    "Consuming more stack elements than there are on the altstack: {:?}",
+                    status
+                )
+            }),
         };
 
         Chunk::new(chunk_scripts, chunk_len, chunk_stats, last_constant)

tests/test_analyzer.rs

@@ -65,7 +65,7 @@ fn inner_fn2() -> Script {
 
 #[test]
 fn test_inner1() {
-    let mut script = inner_fn1();
+    let script = inner_fn1();
     let mut analyzer = StackAnalyzer::new();
     let status = script.get_stack(&mut analyzer);
     assert_eq!(
@@ -76,7 +76,7 @@ fn test_inner1() {
 
 #[test]
 fn test_deepthest() {
-    let mut script = script! (
+    let script = script! (
         {inner_fn1()}
         {inner_fn1()}
         OP_ADD
@@ -88,7 +88,7 @@ fn test_deepthest() {
         [-12, -3]
     );
 
-    let mut script = script!(
+    let script = script!(
         { inner_fn2() }
         { inner_fn2() }
         OP_ADD
@@ -103,7 +103,7 @@ fn test_deepthest() {
 
 #[test]
 fn test_deepthest2() {
-    let mut script = script! (
+    let script = script! (
         {1}
         OP_IF
             { 120 }
@@ -120,7 +120,7 @@ fn test_deepthest2() {
 
 #[test]
 fn test_altstack() {
-    let mut script = script! (
+    let script = script! (
         OP_FROMALTSTACK
         OP_FROMALTSTACK
         OP_FROMALTSTACK
@@ -137,7 +137,7 @@ fn test_altstack() {
         }
     );
 
-    let mut script = script!(
+    let script = script!(
         OP_TOALTSTACK
         OP_TOALTSTACK
         OP_TOALTSTACK
@@ -157,7 +157,7 @@ fn test_altstack() {
 
 #[test]
 fn test_altstack_and_opif() {
-    let mut script = script! (
+    let script = script! (
         OP_IF
         OP_FROMALTSTACK
         OP_SUB

tests/test_chunker.rs

@@ -1,5 +1,5 @@
-use bitcoin::{opcodes::all::{OP_FROMALTSTACK, OP_TOALTSTACK}, ScriptBuf};
-use bitcoin_script::{chunker::ChunkStats, script, Chunker};
+use bitcoin::ScriptBuf;
+use bitcoin_script::{script, Chunker};
 
 #[test]
 fn test_chunker_simple() {