diff --git a/crates/llvm-builder/src/build_type.rs b/crates/llvm-builder/src/build_type.rs index 0c4b508..10f1cac 100644 --- a/crates/llvm-builder/src/build_type.rs +++ b/crates/llvm-builder/src/build_type.rs @@ -22,7 +22,7 @@ impl std::str::FromStr for BuildType { "Release" => Ok(Self::Release), "RelWithDebInfo" => Ok(Self::RelWithDebInfo), "MinSizeRel" => Ok(Self::MinSizeRel), - value => Err(format!("Unsupported build type: `{}`", value)), + value => Err(format!("Unsupported build type: `{value}`")), } } } diff --git a/crates/llvm-builder/src/ccache_variant.rs b/crates/llvm-builder/src/ccache_variant.rs index 3dc1091..179b828 100644 --- a/crates/llvm-builder/src/ccache_variant.rs +++ b/crates/llvm-builder/src/ccache_variant.rs @@ -16,7 +16,7 @@ impl std::str::FromStr for CcacheVariant { match value { "ccache" => Ok(Self::Ccache), "sccache" => Ok(Self::Sccache), - value => Err(format!("Unsupported ccache variant: `{}`", value)), + value => Err(format!("Unsupported ccache variant: `{value}`")), } } } diff --git a/crates/llvm-builder/src/lib.rs b/crates/llvm-builder/src/lib.rs index 445303e..94b1955 100644 --- a/crates/llvm-builder/src/lib.rs +++ b/crates/llvm-builder/src/lib.rs @@ -127,23 +127,22 @@ pub fn build( sanitizer: Option, enable_valgrind: bool, ) -> anyhow::Result<()> { - log::trace!("build type: {:?}", build_type); - log::trace!("target env: {:?}", target_env); - log::trace!("targets: {:?}", targets); - log::trace!("llvm projects: {:?}", llvm_projects); - log::trace!("enable rtti: {:?}", enable_rtti); - log::trace!("default target: {:?}", default_target); - log::trace!("eneable tests: {:?}", enable_tests); - log::trace!("enable_coverage: {:?}", enable_coverage); - log::trace!("extra args: {:?}", extra_args); - log::trace!("sanitzer: {:?}", sanitizer); - log::trace!("enable valgrind: {:?}", enable_valgrind); + log::trace!("build type: {build_type:?}"); + log::trace!("target env: {target_env:?}"); + log::trace!("targets: {targets:?}"); + log::trace!("llvm projects: {llvm_projects:?}"); + log::trace!("enable rtti: {enable_rtti:?}"); + log::trace!("default target: {default_target:?}"); + log::trace!("eneable tests: {enable_tests:?}"); + log::trace!("enable_coverage: {enable_coverage:?}"); + log::trace!("extra args: {extra_args:?}"); + log::trace!("sanitzer: {sanitizer:?}"); + log::trace!("enable valgrind: {enable_valgrind:?}"); if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() { log::error!( - "LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)", - LLVMPath::DIRECTORY_LLVM_SOURCE, - target_env + "LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)", + LLVMPath::DIRECTORY_LLVM_SOURCE ) } diff --git a/crates/llvm-builder/src/llvm_project.rs b/crates/llvm-builder/src/llvm_project.rs index 0a6a35a..d86ecd6 100644 --- a/crates/llvm-builder/src/llvm_project.rs +++ b/crates/llvm-builder/src/llvm_project.rs @@ -22,7 +22,7 @@ impl std::str::FromStr for LLVMProject { "lld" => Ok(Self::LLD), "lldb" => Ok(Self::LLDB), "mlir" => Ok(Self::MLIR), - value => Err(format!("Unsupported LLVM project to enable: `{}`", value)), + value => Err(format!("Unsupported LLVM project to enable: `{value}`")), } } } diff --git a/crates/llvm-builder/src/lock.rs b/crates/llvm-builder/src/lock.rs index b04004c..2932262 100644 --- a/crates/llvm-builder/src/lock.rs +++ b/crates/llvm-builder/src/lock.rs @@ -30,7 +30,7 @@ impl TryFrom<&PathBuf> for Lock { fn try_from(path: &PathBuf) -> Result { let mut config_str = String::new(); let mut config_file = - File::open(path).with_context(|| format!("Error opening {:?} file", path))?; + File::open(path).with_context(|| format!("Error opening {path:?} file"))?; config_file.read_to_string(&mut config_str)?; Ok(toml::from_str(&config_str)?) } diff --git a/crates/llvm-builder/src/platforms/mod.rs b/crates/llvm-builder/src/platforms/mod.rs index 6ad8c97..9f0acd4 100644 --- a/crates/llvm-builder/src/platforms/mod.rs +++ b/crates/llvm-builder/src/platforms/mod.rs @@ -29,7 +29,7 @@ impl FromStr for Platform { fn from_str(value: &str) -> Result { match value { "PolkaVM" => Ok(Self::PolkaVM), - value => Err(format!("Unsupported platform: `{}`", value)), + value => Err(format!("Unsupported platform: `{value}`")), } } } diff --git a/crates/llvm-builder/src/revive_llvm/main.rs b/crates/llvm-builder/src/revive_llvm/main.rs index 6e3b510..25850d8 100644 --- a/crates/llvm-builder/src/revive_llvm/main.rs +++ b/crates/llvm-builder/src/revive_llvm/main.rs @@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> { }) .collect(); - log::debug!("extra_args: {:#?}", extra_args); - log::debug!("extra_args_unescaped: {:#?}", extra_args_unescaped); + log::debug!("extra_args: {extra_args:#?}"); + log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}"); if let Some(ccache_variant) = ccache_variant { revive_llvm_builder::utils::check_presence(ccache_variant.to_string().as_str())?; diff --git a/crates/llvm-builder/src/sanitizer.rs b/crates/llvm-builder/src/sanitizer.rs index 5b982e7..ad852e4 100644 --- a/crates/llvm-builder/src/sanitizer.rs +++ b/crates/llvm-builder/src/sanitizer.rs @@ -30,7 +30,7 @@ impl std::str::FromStr for Sanitizer { "thread" => Ok(Self::Thread), "dataflow" => Ok(Self::DataFlow), "address;undefined" => Ok(Self::AddressUndefined), - value => Err(format!("Unsupported sanitizer: `{}`", value)), + value => Err(format!("Unsupported sanitizer: `{value}`")), } } } diff --git a/crates/llvm-builder/src/target_env.rs b/crates/llvm-builder/src/target_env.rs index 2ddbb1b..34ef6d9 100644 --- a/crates/llvm-builder/src/target_env.rs +++ b/crates/llvm-builder/src/target_env.rs @@ -20,7 +20,7 @@ impl std::str::FromStr for TargetEnv { "gnu" => Ok(Self::GNU), "musl" => Ok(Self::MUSL), "emscripten" => Ok(Self::Emscripten), - value => Err(format!("Unsupported target environment: `{}`", value)), + value => Err(format!("Unsupported target environment: `{value}`")), } } } diff --git a/crates/llvm-builder/src/target_triple.rs b/crates/llvm-builder/src/target_triple.rs index 45a5512..016d692 100644 --- a/crates/llvm-builder/src/target_triple.rs +++ b/crates/llvm-builder/src/target_triple.rs @@ -15,7 +15,7 @@ impl std::str::FromStr for TargetTriple { fn from_str(value: &str) -> Result { match value { "polkavm" => Ok(Self::PolkaVM), - value => Err(format!("Unsupported target triple: `{}`", value)), + value => Err(format!("Unsupported target triple: `{value}`")), } } } diff --git a/crates/llvm-builder/src/utils.rs b/crates/llvm-builder/src/utils.rs index 4abc16f..fbd2b33 100644 --- a/crates/llvm-builder/src/utils.rs +++ b/crates/llvm-builder/src/utils.rs @@ -92,7 +92,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> { pub fn download_musl(name: &str) -> anyhow::Result<()> { log::info!("downloading musl {name}"); let tar_file_name = format!("{name}.tar.gz"); - let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL); + let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}"); let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET .get() .unwrap() @@ -223,6 +223,6 @@ pub fn install_emsdk() -> anyhow::Result<()> { /// The LLVM target directory default path. pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf { crate::llvm_path::DIRECTORY_LLVM_TARGET - .get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env))) + .get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/"))) .clone() } diff --git a/crates/llvm-context/src/polkavm/mod.rs b/crates/llvm-context/src/polkavm/mod.rs index de24171..9403ae1 100644 --- a/crates/llvm-context/src/polkavm/mod.rs +++ b/crates/llvm-context/src/polkavm/mod.rs @@ -37,7 +37,7 @@ pub fn build_assembly_text( let mut disassembled_code = Vec::new(); disassembler .disassemble_into(&mut disassembled_code) - .with_context(|| format!("Failed to disassemble contract: {}", contract_path))?; + .with_context(|| format!("Failed to disassemble contract: {contract_path}"))?; let assembly_text = String::from_utf8(disassembled_code).with_context(|| { format!("Failed to convert disassembled code to string for contract: {contract_path}") diff --git a/crates/resolc/src/project/mod.rs b/crates/resolc/src/project/mod.rs index 615527d..d639e7a 100644 --- a/crates/resolc/src/project/mod.rs +++ b/crates/resolc/src/project/mod.rs @@ -155,8 +155,8 @@ impl Project { .iter() .flat_map(|(file, names)| { names - .iter() - .map(|(name, _address)| format!("{file}:{name}")) + .keys() + .map(|name| format!("{file}:{name}")) .collect::>() }) .collect::>(); diff --git a/crates/resolc/src/resolc/main.rs b/crates/resolc/src/resolc/main.rs index f22ad72..ec3817f 100644 --- a/crates/resolc/src/resolc/main.rs +++ b/crates/resolc/src/resolc/main.rs @@ -240,9 +240,7 @@ fn main_inner() -> anyhow::Result<()> { writeln!( std::io::stdout(), - "Contract `{}` assembly:\n\n{}", - path, - assembly_text + "Contract `{path}` assembly:\n\n{assembly_text}" )?; } if arguments.output_binary { diff --git a/crates/resolc/src/test_utils.rs b/crates/resolc/src/test_utils.rs index 7e3ba2e..299ead8 100644 --- a/crates/resolc/src/test_utils.rs +++ b/crates/resolc/src/test_utils.rs @@ -361,7 +361,7 @@ fn compile_evm( .expect("source should compile"); let object = &contracts .get(contract_name) - .unwrap_or_else(|| panic!("contract '{}' didn't produce bin-runtime", contract_name)); + .unwrap_or_else(|| panic!("contract '{contract_name}' didn't produce bin-runtime")); let code = if runtime { object.1.object.as_str() } else { diff --git a/crates/resolc/src/tests/optimizer.rs b/crates/resolc/src/tests/optimizer.rs index aa58936..4ae16fd 100644 --- a/crates/resolc/src/tests/optimizer.rs +++ b/crates/resolc/src/tests/optimizer.rs @@ -121,10 +121,10 @@ fn optimizer() { assert!( size_when_optimized_for_cycles < size_when_unoptimized, - "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_cycles, size_when_unoptimized, + "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_cycles}B, Unoptimized: {size_when_unoptimized}B", ); assert!( size_when_optimized_for_size < size_when_unoptimized, - "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_size, size_when_unoptimized, + "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_size}B, Unoptimized: {size_when_unoptimized}B", ); } diff --git a/crates/runtime-api/build.rs b/crates/runtime-api/build.rs index 2e54fc4..49a1592 100644 --- a/crates/runtime-api/build.rs +++ b/crates/runtime-api/build.rs @@ -37,12 +37,11 @@ fn compile(source_path: &str, bitcode_path: &str) { source_path, ]) .output() - .unwrap_or_else(|error| panic!("failed to execute clang: {}", error)); + .unwrap_or_else(|error| panic!("failed to execute clang: {error}")); assert!( output.status.success(), - "failed to compile the PolkaVM C API: {:?}", - output + "failed to compile the PolkaVM C API: {output:?}" ); } diff --git a/crates/stdlib/build.rs b/crates/stdlib/build.rs index 8955381..9f27c78 100644 --- a/crates/stdlib/build.rs +++ b/crates/stdlib/build.rs @@ -17,12 +17,11 @@ fn main() { "stdlib.ll", ]) .output() - .unwrap_or_else(|error| panic!("failed to execute llvm-as: {}", error)); + .unwrap_or_else(|error| panic!("failed to execute llvm-as: {error}")); assert!( output.status.success(), - "failed to assemble the stdlib: {:?}", - output + "failed to assemble the stdlib: {output:?}" ); let bitcode = fs::read(bitcode_path).expect("bitcode should have been built"); diff --git a/crates/yul/src/parser/statement/expression/literal.rs b/crates/yul/src/parser/statement/expression/literal.rs index 97d267d..d7b10de 100644 --- a/crates/yul/src/parser/statement/expression/literal.rs +++ b/crates/yul/src/parser/statement/expression/literal.rs @@ -167,7 +167,7 @@ impl Literal { unicode_char.encode_utf8(&mut unicode_bytes); for byte in unicode_bytes.into_iter() { - hex_string.push_str(format!("{:02x}", byte).as_str()); + hex_string.push_str(format!("{byte:02x}").as_str()); } index += 5; } else if string[index..].starts_with('t') {