clippy fixes

Author: FloppyDisck

Cargo.lock

@@ -147,7 +147,7 @@ fn withdraw_rewards(
 pub fn reply(deps: DepsMut<ArchwayQuery>, env: Env, msg: Reply) -> StdResult<Response> {
     match msg.id {
         STAKE_WITHDRAWN_REWARDS => stake_contract_rewards(deps, env, msg),
-        id => Err(StdError::not_found(format!("Unknown reply id: {}", id))),
+        id => Err(StdError::not_found(format!("Unknown reply id: {id}"))),
     }
 }
 

contracts/increment/src/contract.rs

@@ -13,6 +13,6 @@ publish = false
 syn = { version = "2.0", features = ["full", "extra-traits"] }
 quote = "1.0.36"
 proc-macro2 = "1.0"
-error-chain = "0.12.4"
+thiserror = { workspace = true }
 glob = "0.3.1"
 regex = "1.9.3"

proto-build/Cargo.toml

@@ -0,0 +1,15 @@
+use thiserror::Error;
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("{0}")]
+    Io(#[from] std::io::Error),
+    #[error("{0}")]
+    Glob(#[from] glob::GlobError),
+    #[error("{0}")]
+    Pattern(#[from] glob::PatternError),
+    #[error("{0}")]
+    Utf8Error(#[from] std::str::Utf8Error),
+}

proto-build/src/error.rs

@@ -1,10 +1,12 @@
 mod commands;
 mod consts;
+mod error;
 mod parser;
 mod utils;
 
+pub use error::Result;
+use std::path::Path;
 use std::path::PathBuf;
-use std::{io, path::Path};
 
 use crate::commands::apply_patches::apply_patches;
 use crate::commands::cleanup::cleanup;
@@ -16,16 +18,6 @@ use crate::commands::update_submodules::update_submodules;
 use crate::consts::{OUT_DIR, PROTO_DIR};
 use crate::parser::generate_advanced_struct;
 use crate::utils::run::run_cargo;
-use error_chain::error_chain;
-
-error_chain! {
-    foreign_links {
-        IoError(io::Error);
-        Glob(glob::GlobError);
-        Pattern(glob::PatternError);
-        Utf8Error(std::str::Utf8Error);
-    }
-}
 
 fn workspace_root() -> PathBuf {
     let output = run_cargo(["locate-project", "--workspace", "--message-format=plain"]).unwrap();

proto-build/src/main.rs

@@ -56,7 +56,7 @@ pub fn load_and_patch_any(out_dir: &Path) -> BTreeMap<String, (File, BTreeMap<St
             ast.items.pop();
         }
 
-        let file_name = src.to_str().unwrap().split('/').last().unwrap();
+        let file_name = src.to_str().unwrap().split('/').next_back().unwrap();
         project_tokens.insert(file_name.to_string(), (ast, structs));
     }
 

proto-build/src/parser/commands/load_and_patch_any.rs

@@ -7,26 +7,24 @@ use std::path::Path;
 use syn::File;
 
 pub fn save(out_dir: &Path, files: &BTreeMap<String, (File, BTreeMap<String, usize>)>) {
+    let file_regex = Regex::new(r"(\.[[:alnum:]]+\.)rs").unwrap();
+    let patch_regex = Regex::new(r"(\.)").unwrap();
+
     for (file, (data, _)) in files.iter() {
         // Patch the mod file
-        let file_regex = Regex::new(r"(\.[[:alnum:]]+\.)rs").unwrap();
         let new_file = file_regex.replace(file, "${1}abstract.rs").to_string();
 
         patch_file(
             &out_dir.join("mod.rs"),
             &[(
-                &format!(
-                    r"include!\(.{}.\);",
-                    Regex::new(r"(\.)").unwrap().replace(file, r"\.")
-                ),
+                &format!(r"include!\(.{}.\);", patch_regex.replace(file, r"\.")),
                 &format!(
                     "\
                 #[cfg(not(feature = \"abstract-any\"))]\n\
-                include!(\"{}\");\n\
+                include!(\"{file}\");\n\
                 #[cfg(feature = \"abstract-any\")]\n\
-                include!(\"{}\");\
-                ",
-                    file, new_file
+                include!(\"{new_file}\");\
+                "
                 ),
             )],
         )

proto-build/src/parser/commands/save.rs

@@ -7,7 +7,7 @@ pub fn patch_file(path: &Path, replacements: &[(&str, &str)]) -> io::Result<()>
 
     for &(regex, replacement) in replacements {
         contents = Regex::new(regex)
-            .unwrap_or_else(|_| panic!("invalid regex: {}", regex))
+            .unwrap_or_else(|_| panic!("invalid regex: {regex}"))
             .replace_all(&contents, replacement)
             .to_string();
     }

proto-build/src/utils/patch_file.rs

@@ -15,7 +15,7 @@ pub fn run_buf_export(
     proto: &str,
     export_dir: &Path,
 ) -> crate::Result<String> {
-    println!("Exporting {}...", proto);
+    println!("Exporting {proto}...");
     let proto_path = submodules_dir.join(proto).join("proto");
     run_cmd(
         "buf",