Merge pull request #169 from Chia-Network/20241217-clippy

fmt+clippy

src/classic/clvm/__type_compatibility__.rs

@@ -22,7 +22,7 @@ pub fn char_to_string(ch: char) -> String {
 }
 
 pub fn vec_to_string(r: &[u8]) -> String {
-    return String::from_utf8_lossy(r).as_ref().to_string();
+    String::from_utf8_lossy(r).as_ref().to_string()
 }
 
 /**

src/classic/clvm/serialize.rs

@@ -91,7 +91,7 @@ impl<'a> SExpToBytesIterator<'a> {
     }
 }
 
-impl<'a> Iterator for SExpToBytesIterator<'a> {
+impl Iterator for SExpToBytesIterator<'_> {
     type Item = Vec<u8>;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -281,6 +281,6 @@ pub fn atom_from_stream<'a>(
         if blob.length() != size as usize {
             return Err(EvalErr(NodePtr::NIL, "bad encoding".to_string()));
         }
-        return allocator.new_atom(blob.data());
+        allocator.new_atom(blob.data())
     })
 }

src/classic/clvm/sexp.rs

@@ -202,7 +202,7 @@ pub fn to_sexp_type(allocator: &mut Allocator, value: CastableType) -> Result<No
         ));
     }
 
-    return match stack.pop() {
+    match stack.pop() {
         None => Err(EvalErr(NodePtr::NIL, "stack empty".to_string())),
         Some(top) => match top.borrow() {
             CastableType::CLVMObject(o) => Ok(*o),
@@ -211,7 +211,7 @@ pub fn to_sexp_type(allocator: &mut Allocator, value: CastableType) -> Result<No
                 format!("unimplemented {:?}", stack[0]),
             )),
         },
-    };
+    }
 }
 
 pub fn sexp_as_bin(allocator: &mut Allocator, sexp: NodePtr) -> Bytes {

src/classic/clvm_tools/stages/stage_2/optimize.rs

@@ -165,7 +165,7 @@ pub fn cons_q_a_optimizer(
 
     let matched = match_sexp(allocator, cons_q_a_optimizer_pattern, r, HashMap::new());
 
-    return match (
+    match (
         matched.as_ref().and_then(|t1| t1.get("args").copied()),
         matched.as_ref().and_then(|t1| t1.get("sexp").copied()),
     ) {
@@ -177,7 +177,7 @@ pub fn cons_q_a_optimizer(
             }
         }
         _ => Ok(r),
-    };
+    }
 }
 
 fn cons_pattern(allocator: &mut Allocator) -> NodePtr {
@@ -521,41 +521,35 @@ fn path_optimizer(
     let first_match = match_sexp(allocator, first_atom_pattern, r, HashMap::new());
     let rest_match = match_sexp(allocator, rest_atom_pattern, r, HashMap::new());
 
-    return m! {
-        match (first_match, rest_match) {
-            (Some(first), _) => {
-                match first.
-                    get("atom").
-                    and_then(|a| atom(allocator, *a).ok()).
-                    map(|atom| number_from_u8(&atom))
-                {
-                    Some(atom) => {
-                        let node =
-                            NodePath::new(Some(atom)).
-                            add(NodePath::new(None).first());
-                        allocator.new_atom(node.as_path().data())
-                    },
-                    _ => { Ok(r) }
+    match (first_match, rest_match) {
+        (Some(first), _) => {
+            match first
+                .get("atom")
+                .and_then(|a| atom(allocator, *a).ok())
+                .map(|atom| number_from_u8(&atom))
+            {
+                Some(atom) => {
+                    let node = NodePath::new(Some(atom)).add(NodePath::new(None).first());
+                    allocator.new_atom(node.as_path().data())
                 }
-            },
-            (_, Some(rest)) => {
-                match rest.
-                    get("atom").
-                    and_then(|a| atom(allocator, *a).ok()).
-                    map(|atom| number_from_u8(&atom))
-                {
-                    Some(atom) => {
-                        let node =
-                            NodePath::new(Some(atom)).
-                            add(NodePath::new(None).rest());
-                        allocator.new_atom(node.as_path().data())
-                    },
-                    _ => { Ok(r) }
+                _ => Ok(r),
+            }
+        }
+        (_, Some(rest)) => {
+            match rest
+                .get("atom")
+                .and_then(|a| atom(allocator, *a).ok())
+                .map(|atom| number_from_u8(&atom))
+            {
+                Some(atom) => {
+                    let node = NodePath::new(Some(atom)).add(NodePath::new(None).rest());
+                    allocator.new_atom(node.as_path().data())
                 }
-            },
-            _ => Ok(r)
+                _ => Ok(r),
+            }
         }
-    };
+        _ => Ok(r),
+    }
 }
 
 fn quote_pattern_1(allocator: &mut Allocator) -> NodePtr {

src/classic/platform/mod.rs

@@ -11,9 +11,9 @@ impl ArgumentValueConv for PathJoin {
     fn convert(&self, arg: &str) -> Result<ArgumentValue, String> {
         let mut p = PathBuf::new();
         p.push(arg);
-        return Ok(ArgumentValue::ArgString(
+        Ok(ArgumentValue::ArgString(
             None,
             p.as_path().to_str().unwrap().to_string(),
-        ));
+        ))
     }
 }

src/compiler/evaluate.rs

@@ -49,7 +49,7 @@ trait VisitedInfoAccess {
     fn insert_function(&mut self, name: Vec<u8>, body: Rc<BodyForm>);
 }
 
-impl<'info> VisitedInfoAccess for VisitedMarker<'info, VisitedInfo> {
+impl VisitedInfoAccess for VisitedMarker<'_, VisitedInfo> {
     fn get_function(&mut self, name: &[u8]) -> Option<Rc<BodyForm>> {
         if let Some(ref mut info) = self.info {
             info.functions.get(name).cloned()

src/compiler/mod.rs

@@ -267,7 +267,7 @@ impl<'a> CompileContextWrapper<'a> {
 
 /// Drop CompileContextWrapper reverts the contained objects back to the ones
 /// owned by the caller.
-impl<'a> Drop for CompileContextWrapper<'a> {
+impl Drop for CompileContextWrapper<'_> {
     fn drop(&mut self) {
         self.switch();
     }

src/compiler/sexp.rs

@@ -367,7 +367,7 @@ fn list_no_parens(a: &SExp, b: &SExp) -> String {
 }
 
 pub fn decode_string(v: &[u8]) -> String {
-    return String::from_utf8_lossy(v).as_ref().to_string();
+    String::from_utf8_lossy(v).as_ref().to_string()
 }
 
 pub fn printable(a: &[u8], quoted: bool) -> bool {

src/compiler/stackvisit.rs

@@ -51,7 +51,7 @@ impl<'info, T> VisitedMarker<'info, T> {
     }
 }
 
-impl<'info, T> Unvisit<T> for VisitedMarker<'info, T> {
+impl<T> Unvisit<T> for VisitedMarker<'_, T> {
     fn give_back(&mut self, info: Option<Box<T>>) {
         self.info = info;
     }
@@ -66,7 +66,7 @@ impl<'info, T> Unvisit<T> for VisitedMarker<'info, T> {
 }
 
 // When dropped, the info box is handed back.
-impl<'info, T> Drop for VisitedMarker<'info, T> {
+impl<T> Drop for VisitedMarker<'_, T> {
     fn drop(&mut self) {
         let mut info = None;
         swap(&mut self.info, &mut info);

src/util/mod.rs

@@ -40,7 +40,7 @@ where
 }
 
 pub fn skip_leading(s: &str, dash: &str) -> String {
-    return s.graphemes(true).skip_while(|ch| dash == *ch).collect();
+    s.graphemes(true).skip_while(|ch| dash == *ch).collect()
 }
 
 pub fn collapse<A>(r: Result<A, A>) -> A {