Address remaining Clippy warnings in Stylus files

Author: smoelius

src/emit/stylus/cargo_stylus.rs

@@ -15,7 +15,7 @@ pub fn compress_wasm(wasm: &[u8]) -> anyhow::Result<(Vec<u8>, Vec<u8>)> {
     /// EOF prefix used in Stylus compressed WASMs on-chain
     const EOF_PREFIX_NO_DICT: &str = "EFF00000";
 
-    let mut compressor = BrotliEncoder::new(&*wasm, BROTLI_COMPRESSION_LEVEL);
+    let mut compressor = BrotliEncoder::new(wasm, BROTLI_COMPRESSION_LEVEL);
     let mut compressed_bytes = vec![];
     compressor
         .read_to_end(&mut compressed_bytes)

src/emit/stylus/target.rs

@@ -683,7 +683,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                 ptr_plus_offset(
                     bin,
                     contract_byte_ptr,
-                    bin.context.i32_type().const_int(19 as u64, false),
+                    bin.context.i32_type().const_int(19_u64, false),
                 ),
                 bin.context.i8_type().const_int(0x01, false),
             )
@@ -695,7 +695,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
             .builder
             .build_array_alloca(
                 bin.context.i8_type(),
-                i32_const!(32 + 32 + 32 + 32 as u64),
+                i32_const!(32 + 32 + 32 + 32_u64),
                 "buffer",
             )
             .unwrap();
@@ -1124,7 +1124,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                     .left()
                     .unwrap();
 
-                number.into()
+                number
             }
             Expression::Builtin {
                 kind: Builtin::ChainId,
@@ -1135,7 +1135,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                     .left()
                     .unwrap();
 
-                chainid.into()
+                chainid
             }
             Expression::Builtin {
                 kind: Builtin::ContractCode,
@@ -1286,7 +1286,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                     .left()
                     .unwrap();
 
-                gasleft.into()
+                gasleft
             }
             Expression::Builtin {
                 kind: Builtin::GasLimit,
@@ -1297,7 +1297,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                     .left()
                     .unwrap();
 
-                gaslimit.into()
+                gaslimit
             }
             Expression::Builtin {
                 kind: Builtin::GetAddress,
@@ -1408,7 +1408,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                     .left()
                     .unwrap();
 
-                timestamp.into()
+                timestamp
             }
             Expression::Builtin {
                 kind: Builtin::Value,

tests/stylus_tests/milestone_2.rs

@@ -71,6 +71,7 @@ fn milestone_2() {
     assert!(line.contains(r#""topics":["0xa8142743f8f70a4c26f3691cf4ed59718381fb2f18070ec52be1f1022d855557"],"data":"0x0000000000000000000000000000000000000000000000000de0b6b3a7640000""#));
 }
 
+#[allow(clippy::format_collect)]
 fn label_test_block_output(stdout: &str) -> String {
     const LABELS: &[&str] = &[
         "gasleft",
@@ -90,6 +91,7 @@ fn label_test_block_output(stdout: &str) -> String {
         .collect()
 }
 
+#[allow(clippy::format_collect)]
 fn label_test_tstore_output(stdout: &str) -> String {
     const LABELS: &[&str] = &["sload", "tload"];
     let lines = stdout.lines().collect::<Vec<_>>();

tests/stylus_tests/milestone_3.rs

@@ -37,11 +37,10 @@ fn milestone_3() {
     println!("{}", &labeled_stdout);
 
     let balance = get(&labeled_stdout, "balance").unwrap();
-    assert_eq!(1000, u64::from_str_radix(balance, 10).unwrap());
+    assert_eq!(1000, balance.parse::<u64>().unwrap());
 
     let codehash = get(&labeled_stdout, "codehash")
-        .map(|s| s.strip_prefix("0x"))
-        .flatten()
+        .and_then(|s| s.strip_prefix("0x"))
         .unwrap();
 
     let stdout = call(dir, &address, ["getCode()"]).unwrap();
@@ -59,8 +58,8 @@ fn milestone_3() {
     let i = gasprice
         .bytes()
         .position(|c| c.is_ascii_whitespace())
-        .unwrap_or_else(|| gasprice.len());
-    assert_eq!(100000000, u64::from_str_radix(&gasprice[..i], 10).unwrap());
+        .unwrap_or(gasprice.len());
+    assert_eq!(100_000_000, gasprice[..i].parse::<u64>().unwrap());
 
     call(dir, &address, ["test_addmod()"]).unwrap();
 
@@ -73,6 +72,7 @@ fn milestone_3() {
     call(dir, &address, ["test_power()"]).unwrap();
 }
 
+#[allow(clippy::format_collect)]
 fn label(stdout: &str) -> String {
     const LABELS: &[&str] = &["balance", "codehash", "manual_codehash", "gasprice"];
     let lines = stdout.lines().collect::<Vec<_>>();

tests/stylus_tests/uniswap.rs

@@ -222,6 +222,7 @@ fn deploy_uniswap_factory(pair_base: &str, pair_creator: &str) -> (TempDir, Stri
     (tempdir, address)
 }
 
+#[allow(clippy::items_after_statements)]
 fn create_pair(dir: impl AsRef<Path>, factory: &str, erc20_a: &str, erc20_b: &str) -> String {
     let stdout = send(
         dir,
@@ -268,6 +269,6 @@ fn assert_roughly_starts_with(line: &str, prefix: &str) {
             "mismatch at index {i}\n
     line: {line}
   prefix: {prefix}"
-        )
+        );
     }
 }