瀏覽代碼

Fix clippy 1.73 warnings (#1559)

I updated Rust in my computer and fixed the errors from clippy.

Signed-off-by: Lucas Steuernagel <lucas.tnagel@gmail.com>
Lucas Steuernagel 2 年之前
父節點
當前提交
e94a14ae04

+ 1 - 1
solang-parser/src/helpers/ord.rs

@@ -25,7 +25,7 @@ macro_rules! impl_with_cast {
             impl PartialOrd for $t {
                 #[inline]
                 fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-                    PartialOrd::partial_cmp(self.as_discriminant(), other.as_discriminant())
+                    Some(self.cmp(other))
                 }
             }
 

+ 8 - 8
src/codegen/cfg.rs

@@ -657,10 +657,10 @@ impl ControlFlowGraph {
                 dimensions, values, ..
             } => format!(
                 "constant {} [ {} ]",
-                dimensions
-                    .iter()
-                    .map(|d| format!("[{d}]"))
-                    .collect::<String>(),
+                dimensions.iter().fold(String::new(), |mut output, d| {
+                    write!(output, "[{d}]").unwrap();
+                    output
+                }),
                 values
                     .iter()
                     .map(|e| self.expr_to_string(contract, ns, e))
@@ -671,10 +671,10 @@ impl ControlFlowGraph {
                 dimensions, values, ..
             } => format!(
                 "{} [ {} ]",
-                dimensions
-                    .iter()
-                    .map(|d| format!("[{d}]"))
-                    .collect::<String>(),
+                dimensions.iter().fold(String::new(), |mut output, d| {
+                    write!(output, "[{d}]").unwrap();
+                    output
+                }),
                 values
                     .iter()
                     .map(|e| self.expr_to_string(contract, ns, e))

+ 1 - 2
src/codegen/encoding/scale_encoding.rs

@@ -603,8 +603,7 @@ impl AbiEncoding for ScaleEncoding {
                 } => {
                     let bytes = value.to_bytes_be().1;
                     if bytes.len() < 4 {
-                        let mut buf = Vec::new();
-                        buf.resize(4 - bytes.len(), 0);
+                        let buf = vec![0; 4 - bytes.len()];
                         result.extend_from_slice(&buf);
                     }
                     result.extend_from_slice(&bytes[..]);

+ 1 - 2
src/codegen/statements/mod.rs

@@ -1059,8 +1059,7 @@ impl Type {
                 value: false,
             }),
             Type::Bytes(n) => {
-                let mut l = Vec::new();
-                l.resize(*n as usize, 0);
+                let l = vec![0; *n as usize];
                 Some(Expression::BytesLiteral {
                     loc: Codegen,
                     ty: self.clone(),

+ 1 - 1
src/sema/contracts.rs

@@ -599,7 +599,7 @@ fn check_inheritance(contract_no: usize, ns: &mut ast::Namespace) {
                 ns.contracts[contract_no]
                     .virtual_functions
                     .entry(signature)
-                    .or_insert_with(Vec::new)
+                    .or_default()
                     .push(function_no); // there is always at least 1 element in the vector
             }
 

+ 1 - 3
tests/polkadot.rs

@@ -937,7 +937,7 @@ impl MockSubstrate {
             },
             Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => match self.0.data().output {
-                HostReturn::Data(flags, _) if flags == 1 => (),
+                HostReturn::Data(1, _) => (),
                 _ => panic!("unexpected return from main"),
             },
         }
@@ -965,8 +965,6 @@ impl MockSubstrate {
         let mem = self.0.data().memory.unwrap().data(&mut self.0);
         let memsize = mem.len();
         println!("memory size:{memsize}");
-        let mut buf = Vec::new();
-        buf.resize(memsize, 0);
 
         let mut current_elem = 0x10000;
         let mut last_elem = 0u32;

+ 7 - 14
tests/polkadot_tests/expressions.rs

@@ -478,8 +478,7 @@ fn complement() {
 
     runtime.function("do_test", Vec::new());
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let args = vec![0; 32];
 
     runtime.function("do_complement", args);
 
@@ -523,8 +522,7 @@ fn bitwise() {
 
     runtime.function("do_test", Vec::new());
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_xor", args);
@@ -534,8 +532,7 @@ fn bitwise() {
     assert!(ret.len() == 32);
     assert!(ret.iter().filter(|x| **x == 255).count() == 32);
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_or", args);
@@ -545,8 +542,7 @@ fn bitwise() {
     assert!(ret.len() == 32);
     assert!(ret.iter().filter(|x| **x == 255).count() == 32);
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_and", args);
@@ -630,8 +626,7 @@ fn assign_bitwise() {
 
     runtime.function("do_test", Vec::new());
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_xor", args);
@@ -641,8 +636,7 @@ fn assign_bitwise() {
     assert!(ret.len() == 32);
     assert!(ret.iter().filter(|x| **x == 255).count() == 32);
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_or", args);
@@ -652,8 +646,7 @@ fn assign_bitwise() {
     assert!(ret.len() == 32);
     assert!(ret.iter().filter(|x| **x == 255).count() == 32);
 
-    let mut args = Vec::new();
-    args.resize(32, 0);
+    let mut args = vec![0; 32];
     args.resize(64, 0xff);
 
     runtime.function("do_and", args);

+ 3 - 6
tests/polkadot_tests/mappings.rs

@@ -179,8 +179,7 @@ fn test_string() {
 
     for _ in 0..100 {
         let len = rng.gen::<usize>() % 256;
-        let mut index = Vec::new();
-        index.resize(len, 0u8);
+        let mut index = vec![0u8; len];
         rng.fill(&mut index[..]);
         let val = rng.gen::<i64>();
 
@@ -247,8 +246,7 @@ fn test_user() {
 
     for _ in 0..100 {
         let len = rng.gen::<usize>() % 256;
-        let mut index = Vec::new();
-        index.resize(len, 0u8);
+        let mut index = vec![0u8; len];
         rng.fill(&mut index[..]);
         let mut val = [0u8; 32];
         rng.fill(&mut val[..]);
@@ -323,8 +321,7 @@ fn test_string_map() {
 
     for _ in 0..10 {
         let len = rng.gen::<usize>() % 256;
-        let mut val = Vec::new();
-        val.resize(len, 0u8);
+        let mut val = vec![0u8; len];
         rng.fill(&mut val[..]);
         let mut address = [0u8; 32];
         rng.fill(&mut address[..]);

+ 1 - 4
tests/polkadot_tests/strings.rs

@@ -298,10 +298,7 @@ fn string_abi_decode() {
     let mut rng = rand::thread_rng();
 
     for len in 0x4000 - 10..0x4000 + 10 {
-        let mut s = Vec::new();
-
-        s.resize(len, 0);
-
+        let mut s = vec![0; len];
         rng.fill(&mut s[..]);
 
         let mut runtime = build_solidity(

+ 1 - 2
tests/solana.rs

@@ -337,8 +337,7 @@ fn serialize_parameters(
 
         let padding = v.len() % 8;
         if padding != 0 {
-            let mut p = Vec::new();
-            p.resize(8 - padding, 0);
+            let p = vec![0; 8 - padding];
             v.extend_from_slice(&p);
         }
         // rent epoch

+ 1 - 2
tests/solana_tests/abi_encode.rs

@@ -729,8 +729,7 @@ contract Testing {
     let decoded = Res1::try_from_slice(&encoded).unwrap();
 
     assert_eq!(decoded.item_1.len(), 1);
-    let mut res1_c: Vec<u8> = Vec::new();
-    res1_c.resize(32, 0);
+    let mut res1_c: Vec<u8> = vec![0; 32];
 
     assert_eq!(
         decoded.item_1[0][0][0],

+ 2 - 4
tests/solana_tests/arrays.rs

@@ -1627,11 +1627,9 @@ fn initialization_with_literal() {
         .accounts(vec![("dataAccount", data_account)])
         .call();
 
-    let mut addr1: Vec<u8> = Vec::new();
-    addr1.resize(32, 0);
+    let mut addr1: Vec<u8> = vec![0; 32];
     addr1[0] = 1;
-    let mut addr2: Vec<u8> = Vec::new();
-    addr2.resize(32, 0);
+    let mut addr2: Vec<u8> = vec![0; 32];
     addr2[0] = 2;
     let _ = vm
         .function("split")