Fix more warnings etc

paritytech · Sep 27, 2024 · b86d8d8 · b86d8d8
1 parent 18a05cb
commit b86d8d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -73,7 +73,7 @@ jobs:
         uses: actions-rs/cargo@v1.0.3
         with:
           command: check
-          args: --all-targets --all-features --target wasm32-unknown-unknown
+          args: --all-targets --no-default-features --features legacy,error-tracing --target wasm32-unknown-unknown
 
   fmt:
     name: Cargo fmt

diff --git a/src/decoding/extrinsic_type_info.rs b/src/decoding/extrinsic_type_info.rs
@@ -15,7 +15,6 @@
 
 use alloc::borrow::Cow;
 use alloc::string::String;
-use alloc::vec;
 use alloc::vec::Vec;
 use core::write;
 
@@ -469,10 +468,10 @@ const _: () = {
                     Ok(ExtrinsicSignatureInfo {
                         address_id: parse_lookup_name("hardcoded::ExtrinsicAddress")?,
                         signature_id: parse_lookup_name("hardcoded::ExtrinsicSignature")?,
-                        transaction_extension_ids: vec![ExtrinsicInfoArg {
+                        transaction_extension_ids: Vec::from_iter([ExtrinsicInfoArg {
                             name: Cow::Borrowed("ExtrinsicSignedExtensions"),
                             id: parse_lookup_name("hardcoded::ExtrinsicSignedExtensions")?,
-                        }],
+                        }]),
                     })
                 }
             }

diff --git a/src/decoding/storage_type_info.rs b/src/decoding/storage_type_info.rs
@@ -15,7 +15,6 @@
 
 use alloc::borrow::Cow;
 use alloc::borrow::ToOwned;
-use alloc::vec;
 use alloc::vec::Vec;
 
 /// This is implemented for all metadatas exposed from `frame_metadata` and is responsible for extracting the
@@ -379,7 +378,7 @@ mod legacy {
                             path::StorageEntryType::Plain(ty) => {
                                 let value_id = decode_lookup_name_or_err(ty, pallet_name)?;
                                 Ok(StorageInfo {
-                                    keys: vec![],
+                                    keys: Vec::new(),
                                     value_id,
                                 })
                             }
@@ -390,7 +389,7 @@ mod legacy {
                                 let hasher = $to_storage_hasher(hasher);
                                 let value_id = decode_lookup_name_or_err(value, pallet_name)?;
                                 Ok(StorageInfo {
-                                    keys: vec![StorageKeyInfo { hasher, key_id }],
+                                    keys: Vec::from_iter([StorageKeyInfo { hasher, key_id }]),
                                     value_id,
                                 })
                             }
@@ -407,7 +406,7 @@ mod legacy {
                                 let key2_hasher = $to_storage_hasher(key2_hasher);
                                 let value_id = decode_lookup_name_or_err(value, pallet_name)?;
                                 Ok(StorageInfo {
-                                    keys: vec![
+                                    keys: Vec::from_iter([
                                         StorageKeyInfo {
                                             hasher: key1_hasher,
                                             key_id: key1_id,
@@ -416,7 +415,7 @@ mod legacy {
                                             hasher: key2_hasher,
                                             key_id: key2_id,
                                         },
-                                    ],
+                                    ]),
                                     value_id,
                                 })
                             }
@@ -493,7 +492,7 @@ mod legacy {
                 frame_metadata::v13::StorageEntryType::Plain(ty) => {
                     let value_id = decode_lookup_name_or_err(ty, pallet_name)?;
                     Ok(StorageInfo {
-                        keys: vec![],
+                        keys: Vec::new(),
                         value_id,
                     })
                 }
@@ -504,7 +503,7 @@ mod legacy {
                     let hasher = to_storage_hasher_v13(hasher);
                     let value_id = decode_lookup_name_or_err(value, pallet_name)?;
                     Ok(StorageInfo {
-                        keys: vec![StorageKeyInfo { hasher, key_id }],
+                        keys: Vec::from_iter([StorageKeyInfo { hasher, key_id }]),
                         value_id,
                     })
                 }
@@ -521,7 +520,7 @@ mod legacy {
                     let key2_hasher = to_storage_hasher_v13(key2_hasher);
                     let value_id = decode_lookup_name_or_err(value, pallet_name)?;
                     Ok(StorageInfo {
-                        keys: vec![
+                        keys: Vec::from_iter([
                             StorageKeyInfo {
                                 hasher: key1_hasher,
                                 key_id: key1_id,
@@ -530,7 +529,7 @@ mod legacy {
                                 hasher: key2_hasher,
                                 key_id: key2_id,
                             },
-                        ],
+                        ]),
                         value_id,
                     })
                 }

diff --git a/src/utils/decode_with_error_tracing.rs b/src/utils/decode_with_error_tracing.rs
@@ -15,7 +15,6 @@
 
 use alloc::format;
 use alloc::string::String;
-use alloc::string::ToString;
 
 /// Decode some bytes given a type ID and type resolver, and a visitor which decides the output value.
 ///
@@ -56,7 +55,7 @@ where
                 .map(|v| v.map_context(|id| format!("{id:?}")))
                 .map_err(|te| DecodeErrorTrace {
                     original_error: format!("{e:?}"),
-                    tracing_error: te.to_string(),
+                    tracing_error: alloc::string::ToString::to_string(&te),
                 })?;
 
             // If the above succeeds (we're expecting it to fail), then print the value out here.