Cleanup, move Update type in lib

Author: grandizzy

crates/compilers/src/flatten.rs

@@ -3,7 +3,7 @@ use crate::{
     filter::MaybeSolData,
     replace_source_content,
     resolver::parse::SolData,
-    ArtifactOutput, CompilerSettings, Graph, Project, ProjectPathsConfig,
+    ArtifactOutput, CompilerSettings, Graph, Project, ProjectPathsConfig, Updates,
 };
 use foundry_compilers_artifacts::{
     ast::{visitor::Visitor, *},
@@ -18,7 +18,7 @@ use foundry_compilers_core::{
 };
 use itertools::Itertools;
 use std::{
-    collections::{BTreeSet, HashMap, HashSet},
+    collections::{HashMap, HashSet},
     hash::Hash,
     path::{Path, PathBuf},
     sync::Arc,
@@ -112,11 +112,6 @@ impl Visitor for ReferencesCollector {
     }
 }
 
-pub type Update = (usize, usize, String);
-/// Updates to be applied to the sources.
-/// source_path -> (start, end, new_value)
-pub type Updates = HashMap<PathBuf, BTreeSet<(usize, usize, String)>>;
-
 pub struct FlatteningResult {
     /// Updated source in the order they should be written to the output file.
     sources: Vec<String>,

crates/compilers/src/lib.rs

@@ -40,14 +40,18 @@ pub use filter::{FileFilter, SparseOutputFilter, TestFileFilter};
 
 pub mod report;
 
+/// Updates to be applied to the sources.
+/// source_path -> (start, end, new_value)
+pub type Update = (usize, usize, String);
+pub type Updates = HashMap<PathBuf, BTreeSet<Update>>;
+
 /// Utilities for creating, mocking and testing of (temporary) projects
 #[cfg(feature = "project-util")]
 pub mod project_util;
 
 pub use foundry_compilers_artifacts as artifacts;
 pub use foundry_compilers_core::{error, utils};
 
-use crate::flatten::Update;
 use cache::CompilerCache;
 use compile::output::contracts::VersionedContracts;
 use compilers::multi::MultiCompiler;
@@ -64,7 +68,7 @@ use project::ProjectCompiler;
 use semver::Version;
 use solc::SolcSettings;
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{BTreeMap, BTreeSet, HashMap, HashSet},
     path::{Path, PathBuf},
 };
 

crates/compilers/src/preprocessor.rs

@@ -1,10 +1,10 @@
 use super::project::Preprocessor;
 use crate::{
-    flatten::{apply_updates, Updates},
+    flatten::apply_updates,
     multi::{MultiCompiler, MultiCompilerInput, MultiCompilerLanguage},
     replace_source_content,
     solc::{SolcCompiler, SolcVersionedInput},
-    Compiler, ProjectPathsConfig, Result, SolcError,
+    Compiler, ProjectPathsConfig, Result, SolcError, Updates,
 };
 use alloy_primitives::hex;
 use foundry_compilers_artifacts::{