diff --git a/ethers-solc/src/cache.rs b/ethers-solc/src/cache.rs index b0586712c..a239f0f0f 100644 --- a/ethers-solc/src/cache.rs +++ b/ethers-solc/src/cache.rs @@ -500,7 +500,7 @@ impl CacheEntry { entry.insert(artifacts); } Entry::Occupied(mut entry) => { - entry.get_mut().extend(artifacts.into_iter()); + entry.get_mut().extend(artifacts); } } } diff --git a/ethers-solc/src/compile/output/mod.rs b/ethers-solc/src/compile/output/mod.rs index f0dcc25a9..b56a3691b 100644 --- a/ethers-solc/src/compile/output/mod.rs +++ b/ethers-solc/src/compile/output/mod.rs @@ -12,7 +12,7 @@ use crate::{ }; use contracts::{VersionedContract, VersionedContracts}; use semver::Version; -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; use std::{collections::BTreeMap, fmt, path::Path}; use tracing::trace; use yansi::Paint; diff --git a/ethers-solc/src/config.rs b/ethers-solc/src/config.rs index e400e231f..eb25f52fc 100644 --- a/ethers-solc/src/config.rs +++ b/ethers-solc/src/config.rs @@ -439,8 +439,7 @@ impl ProjectPathsConfig { if cap.name("ignore").is_some() { continue } - if let Some(name_match) = - vec!["n1", "n2", "n3"].iter().find_map(|name| cap.name(name)) + if let Some(name_match) = ["n1", "n2", "n3"].iter().find_map(|name| cap.name(name)) { let name_match_range = utils::range_by_offset(&name_match.range(), replace_offset); diff --git a/ethers-solc/src/resolver/parse.rs b/ethers-solc/src/resolver/parse.rs index 8cb4e39f3..4873693fe 100644 --- a/ethers-solc/src/resolver/parse.rs +++ b/ethers-solc/src/resolver/parse.rs @@ -265,9 +265,7 @@ fn capture_outer_and_inner<'a>( pub fn capture_imports(content: &str) -> Vec> { let mut imports = vec![]; for cap in utils::RE_SOL_IMPORT.captures_iter(content) { - if let Some(name_match) = - vec!["p1", "p2", "p3", "p4"].iter().find_map(|name| cap.name(name)) - { + if let Some(name_match) = ["p1", "p2", "p3", "p4"].iter().find_map(|name| cap.name(name)) { let statement_match = cap.get(0).unwrap(); let mut aliases = vec![]; for alias_cap in utils::RE_SOL_IMPORT_ALIAS.captures_iter(statement_match.as_str()) { diff --git a/ethers-solc/src/utils.rs b/ethers-solc/src/utils.rs index 24e45fa47..984e64924 100644 --- a/ethers-solc/src/utils.rs +++ b/ethers-solc/src/utils.rs @@ -617,13 +617,13 @@ import './../libraries/JBTokens.sol'; #[test] fn can_find_import_paths() { - let s = r##"//SPDX-License-Identifier: Unlicense + let s = r#"//SPDX-License-Identifier: Unlicense pragma solidity ^0.8.0; import "hardhat/console.sol"; import "../contract/Contract.sol"; import { T } from "../Test.sol"; import { T } from '../Test2.sol'; -"##; +"#; assert_eq!( vec!["hardhat/console.sol", "../contract/Contract.sol", "../Test.sol", "../Test2.sol"], find_import_paths(s).map(|m| m.as_str()).collect::>() diff --git a/examples/events/examples/filtering.rs b/examples/events/examples/filtering.rs index 0e23baae0..e43454273 100644 --- a/examples/events/examples/filtering.rs +++ b/examples/events/examples/filtering.rs @@ -19,7 +19,7 @@ const USDT_ADDRESS: &str = "0xdAC17F958D2ee523a2206206994597C13D831ec7"; async fn main() -> Result<()> { let provider = Provider::::try_from(HTTP_URL)?; let client = Arc::new(provider); - let token_topics = vec![ + let token_topics = [ H256::from(USDC_ADDRESS.parse::()?), H256::from(USDT_ADDRESS.parse::()?), H256::from(DAI_ADDRESS.parse::()?),