Merge pull request #6175 from jferrant/chore/fix-stx-genesis-clippy

Add clippy to stx-genesis

Author: obycode

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
-clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
+clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

stx-genesis/build.rs

@@ -86,7 +86,7 @@ fn write_chainstate_archive(
         .skip(2)
         .take_while(|line| !line.eq(&section_footer))
     {
-        encoder.write_all(&[line.as_bytes(), &[b'\n']].concat())?;
+        encoder.write_all(&[line.as_bytes(), b"\n"].concat())?;
     }
 
     let mut out_file = encoder.finish().into_result().unwrap();

stx-genesis/src/lib.rs

@@ -119,7 +119,7 @@ fn read_deflated_zonefiles(
         zonefile_hash: pair[0].to_owned(),
         zonefile_content: pair[1].replace("\\n", "\n"),
     });
-    return Box::new(pair_iter);
+    Box::new(pair_iter)
 }
 
 fn iter_deflated_csv(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = Vec<String>>> {
@@ -130,15 +130,15 @@ fn iter_deflated_csv(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = Ve
         .lines()
         .map(|line| line.unwrap())
         .map(|line| line.split(',').map(String::from).collect());
-    return Box::new(line_iter);
+    Box::new(line_iter)
 }
 
 fn read_balances(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = GenesisAccountBalance>> {
     let balances = iter_deflated_csv(deflate_bytes).map(|cols| GenesisAccountBalance {
         address: cols[0].to_string(),
         amount: cols[1].parse::<u64>().unwrap(),
     });
-    return Box::new(balances);
+    Box::new(balances)
 }
 
 fn read_lockups(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = GenesisAccountLockup>> {
@@ -147,7 +147,7 @@ fn read_lockups(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = Genesis
         amount: cols[1].parse::<u64>().unwrap(),
         block_height: cols[2].parse::<u64>().unwrap(),
     });
-    return Box::new(lockups);
+    Box::new(lockups)
 }
 
 fn read_namespaces(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = GenesisNamespace>> {
@@ -161,7 +161,7 @@ fn read_namespaces(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = Gene
         no_vowel_discount: cols[6].parse::<i64>().unwrap(),
         lifetime: cols[7].parse::<i64>().unwrap(),
     });
-    return Box::new(namespaces);
+    Box::new(namespaces)
 }
 
 fn read_names(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = GenesisName>> {
@@ -170,7 +170,7 @@ fn read_names(deflate_bytes: &'static [u8]) -> Box<dyn Iterator<Item = GenesisNa
         owner: cols[1].to_string(),
         zonefile_hash: cols[2].to_string(),
     });
-    return Box::new(names);
+    Box::new(names)
 }
 
 #[cfg(test)]