Skip to content

Commit 3dfdb99

Browse files
author
github-actions
committed
Fix lint issues
1 parent eca990a commit 3dfdb99

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

crates/solidity/testing/sourcify/src/compilation_builder.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ impl<'c> CompilationBuilder<'c> {
3535

3636
let source = self.contract.read_file(filename)?;
3737

38-
let AddFileResponse { import_paths } =
39-
self.internal.add_file(filename.into(), &source);
38+
let AddFileResponse { import_paths } = self.internal.add_file(filename.into(), &source);
4039

4140
for import_path in import_paths {
4241
let import_path = import_path.node().unparse();

crates/solidity/testing/sourcify/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use infra_utils::github::GitHub;
1818
use infra_utils::paths::PathExtensions;
1919
use infra_utils::terminal::Terminal;
2020
use results::{display_all_results, AllResults};
21-
use slang_solidity::compilation::CompilationUnit;
2221
use sourcify::{ContractArchive, Manifest};
2322
use tests::{run_in_parallel, run_with_trace, test_single_contract};
2423

crates/solidity/testing/sourcify/src/sourcify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl ArchiveDescriptor {
167167
/// represented by this `ArchiveDescriptor`.
168168
fn archive_dir(&self) -> PathBuf {
169169
CargoWorkspace::locate_source_crate("solidity_testing_sourcify")
170-
.unwrap_or(PathBuf::new())
170+
.unwrap_or_default()
171171
.join(format!(
172172
"target/sourcify_{chain_id}/{shard_prefix:02x}",
173173
chain_id = self.chain_id,

crates/solidity/testing/sourcify/src/tests.rs

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
use anyhow::{Result, bail};
1+
use anyhow::{bail, Result};
22
use rayon::iter::{ParallelBridge, ParallelIterator};
3-
4-
use slang_solidity::cst::{Cursor, NodeKind, NonterminalKind, TextRange, TerminalKindExtensions};
3+
use slang_solidity::compilation::CompilationUnit;
4+
use slang_solidity::cst::{Cursor, NodeKind, NonterminalKind, TerminalKindExtensions, TextRange};
55
use slang_solidity::diagnostic::{Diagnostic, Severity};
6-
use slang_solidity::{compilation::CompilationUnit, utils::LanguageFacts};
6+
use slang_solidity::utils::LanguageFacts;
77

8+
use crate::command::TestOptions;
9+
use crate::events::{Events, TestOutcome};
810
use crate::sourcify::{Contract, ContractArchive, Manifest};
9-
use crate::{command::TestOptions, events::{Events, TestOutcome}};
1011

11-
pub fn test_single_contract(manifest: &Manifest, contract_id: &str, opts: &TestOptions) -> Result<()> {
12+
pub fn test_single_contract(
13+
manifest: &Manifest,
14+
contract_id: &str,
15+
opts: &TestOptions,
16+
) -> Result<()> {
1217
if let Some(contract) = manifest.get_contract(contract_id) {
1318
let mut events = Events::new(1, 0);
1419

@@ -204,15 +209,18 @@ fn run_bindings_check(
204209
let binding_error = BindingError::UnboundIdentifier(cursor.clone());
205210

206211
if let Ok(source) = contract.read_file(file.id()) {
207-
let msg =
208-
slang_solidity::diagnostic::render(&binding_error, file.id(), &source, true);
212+
let msg = slang_solidity::diagnostic::render(
213+
&binding_error,
214+
file.id(),
215+
&source,
216+
true,
217+
);
209218
events.bindings_error(format!(
210219
"[{version}] Binding Error: No definition or reference\n{msg}",
211220
version = contract.version,
212221
));
213222
}
214223

215-
216224
test_outcome = TestOutcome::Failed;
217225
}
218226
}

0 commit comments

Comments
 (0)