From b473bfdf1e3359427fcd04c746f297c5e8eaa536 Mon Sep 17 00:00:00 2001 From: franfran Date: Wed, 4 Jan 2023 00:16:50 +0100 Subject: [PATCH] nitzz --- ethers-solc/src/artifact_output/configurable.rs | 8 ++++---- ethers-solc/src/artifacts/mod.rs | 17 +++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ethers-solc/src/artifact_output/configurable.rs b/ethers-solc/src/artifact_output/configurable.rs index e75bc387..daa995f6 100644 --- a/ethers-solc/src/artifact_output/configurable.rs +++ b/ethers-solc/src/artifact_output/configurable.rs @@ -19,7 +19,7 @@ use crate::{ }, CompactContractBytecodeCow, DevDoc, Evm, Ewasm, FunctionDebugData, GasEstimates, GeneratedSource, LosslessAbi, LosslessMetadata, Metadata, Offsets, - Settings, /*SourceUnit,*/ + Settings, /* SourceUnit, */ StorageLayout, UserDoc, }, sources::VersionedSourceFile, @@ -154,7 +154,7 @@ pub struct ConfigurableArtifacts { /// _always_ be done using a public constructor or update syntax: /// /// ```rust - /// + /// /// use ethers_solc::{ExtraOutputFiles, ConfigurableArtifacts}; /// let config = ConfigurableArtifacts { /// additional_files: ExtraOutputFiles { metadata: true, ..Default::default() }, @@ -397,7 +397,7 @@ pub struct ExtraOutputValues { /// _always_ be done using a public constructor or update syntax: /// /// ```rust - /// + /// /// use ethers_solc::ExtraOutputValues; /// let config = ExtraOutputValues { /// ir: true, @@ -515,7 +515,7 @@ pub struct ExtraOutputFiles { /// _always_ be done using a public constructor or update syntax: /// /// ```rust - /// + /// /// use ethers_solc::ExtraOutputFiles; /// let config = ExtraOutputFiles { /// metadata: true, diff --git a/ethers-solc/src/artifacts/mod.rs b/ethers-solc/src/artifacts/mod.rs index 1ab55662..b95cd17e 100644 --- a/ethers-solc/src/artifacts/mod.rs +++ b/ethers-solc/src/artifacts/mod.rs @@ -1,8 +1,12 @@ //! Solc artifact types use crate::{ - artifacts::lowfidelity::{Ast, NodeType}, + artifacts::{ + lowfidelity::{Ast, NodeType}, + output_selection::{ContractOutputSelection, OutputSelection}, + }, compile::*, error::SolcIoError, + filter::FilteredSources, remappings::Remapping, utils, ProjectPathsConfig, SolcError, }; @@ -25,13 +29,6 @@ pub mod bytecode; pub mod contract; pub mod output_selection; pub mod serde_helpers; -use crate::{ - artifacts::{ - lowfidelity::NodeType, - output_selection::{ContractOutputSelection, OutputSelection}, - }, - filter::FilteredSources, -}; pub use bytecode::*; pub use contract::*; pub use serde_helpers::{deserialize_bytes, deserialize_opt_bytes}; @@ -540,7 +537,7 @@ impl Libraries { if items.next().is_some() { return Err(SolcError::msg(format!( "failed to parse, too many arguments passed: {lib}" - ))); + ))) } libraries .entry(file.into()) @@ -1856,7 +1853,7 @@ impl SourceFile { return ast .nodes .iter() - .any(|node| matches!(node.node_type, NodeType::ContractDefinition)); + .any(|node| matches!(node.node_type, NodeType::ContractDefinition)) // abstract contract, interfaces: ContractDefinition }