chore: rustfmt, clippy

Author: uncomputable

macro/src/generate.rs

@@ -4,7 +4,9 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, quote_spanned};
 
 pub fn generate(syntax: Vec<(Syntax, Span)>) -> TokenStream {
-    let mut tokens = quote!(::bitcoin_script::Script::new(::bitcoin_script::function_name!()));
+    let mut tokens = quote!(::bitcoin_script::Script::new(
+        ::bitcoin_script::function_name!()
+    ));
 
     for (item, span) in syntax {
         let push = match item {

macro/src/parse.rs

@@ -355,9 +355,7 @@ pub fn parse(tokens: TokenStream) -> Vec<(Syntax, Span)> {
             // Wrap if-else statements such that they return a Vec<ScriptBuf>
             (Ident(_), "if") => parse_if(token, &mut tokens),
             // Replace DEBUG with OP_RESERVED
-            (Ident(_), "DEBUG") => {
-                (Syntax::Opcode(OP_RESERVED), token.span())
-            }
+            (Ident(_), "DEBUG") => (Syntax::Opcode(OP_RESERVED), token.span()),
 
             // identifier, look up opcode
             (Ident(_), _) => match parse_opcode(&token_str) {

src/builder.rs

@@ -47,15 +47,18 @@ fn calculate_hash<T: Hash>(t: &T) -> u64 {
 
 impl StructuredScript {
     pub fn new(debug_info: &str) -> Self {
-        let blocks = Vec::new();
         StructuredScript {
             size: 0,
             debug_identifier: debug_info.to_string(),
-            blocks,
+            blocks: Vec::new(),
             script_map: HashMap::new(),
         }
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.size == 0
+    }
+
     pub fn len(&self) -> usize {
         self.size
     }
@@ -67,7 +70,7 @@ impl StructuredScript {
     pub fn get_structured_script(&self, id: &u64) -> &StructuredScript {
         self.script_map
             .get(id)
-            .expect(&format!("script id: {} not found in script_map.", id))
+            .unwrap_or_else(|| panic!("script id: {} not found in script_map.", id))
     }
 
     // Return the debug information of the Opcode at position
@@ -137,10 +140,10 @@ impl StructuredScript {
     }
 
     pub fn push_env_script(mut self, mut data: StructuredScript) -> StructuredScript {
-        if data.len() == 0 {
+        if data.is_empty() {
             return self;
         }
-        if self.len() == 0 {
+        if self.is_empty() {
             return data;
         }
 
@@ -308,8 +311,7 @@ impl NotU8Pushable for u32 {
 }
 impl NotU8Pushable for usize {
     fn bitcoin_script_push(self, builder: StructuredScript) -> StructuredScript {
-        builder
-            .push_int(i64::try_from(self).unwrap_or_else(|_| panic!("Usize does not fit in i64")))
+        builder.push_int(i64::try_from(self).expect("Usize does not fit in i64"))
     }
 }
 impl NotU8Pushable for Vec<u8> {