chore: rename assoc

Author: DaniPopes

crates/compilers/src/cache.rs

@@ -658,7 +658,7 @@ pub(crate) struct ArtifactsCacheInner<
     pub cached_builds: Builds<C::Language>,
 
     /// Relationship between all the files.
-    pub edges: GraphEdges<C::ParsedSources>,
+    pub edges: GraphEdges<C::Parser>,
 
     /// The project.
     pub project: &'a Project<C, T>,
@@ -891,8 +891,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
 
         // Build a temporary graph for walking imports. We need this because `self.edges`
         // only contains graph data for in-scope sources but we are operating on cache entries.
-        if let Ok(graph) = Graph::<C::ParsedSources>::resolve_sources(&self.project.paths, sources)
-        {
+        if let Ok(graph) = Graph::<C::Parser>::resolve_sources(&self.project.paths, sources) {
             let (sources, edges) = graph.into_sources();
 
             // Calculate content hashes for later comparison.
@@ -1022,7 +1021,7 @@ pub(crate) enum ArtifactsCache<
     C: Compiler,
 > {
     /// Cache nothing on disk
-    Ephemeral(GraphEdges<C::ParsedSources>, &'a Project<C, T>),
+    Ephemeral(GraphEdges<C::Parser>, &'a Project<C, T>),
     /// Handles the actual cached artifacts, detects artifacts that can be reused
     Cached(ArtifactsCacheInner<'a, T, C>),
 }
@@ -1034,7 +1033,7 @@ impl<'a, T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
     #[instrument(name = "ArtifactsCache::new", skip(project, edges))]
     pub fn new(
         project: &'a Project<C, T>,
-        edges: GraphEdges<C::ParsedSources>,
+        edges: GraphEdges<C::Parser>,
         preprocessed: bool,
     ) -> Result<Self> {
         /// Returns the [CompilerCache] to use
@@ -1119,7 +1118,7 @@ impl<'a, T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
     }
 
     /// Returns the graph data for this project
-    pub fn graph(&self) -> &GraphEdges<C::ParsedSources> {
+    pub fn graph(&self) -> &GraphEdges<C::Parser> {
         match self {
             ArtifactsCache::Ephemeral(graph, _) => graph,
             ArtifactsCache::Cached(inner) => &inner.edges,
@@ -1199,7 +1198,7 @@ impl<'a, T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
         written_artifacts: &Artifacts<A>,
         written_build_infos: &Vec<RawBuildInfo<C::Language>>,
         write_to_disk: bool,
-    ) -> Result<(Artifacts<A>, Builds<C::Language>, GraphEdges<C::ParsedSources>)>
+    ) -> Result<(Artifacts<A>, Builds<C::Language>, GraphEdges<C::Parser>)>
     where
         T: ArtifactOutput<Artifact = A>,
     {

crates/compilers/src/compile/output/mod.rs

@@ -83,19 +83,19 @@ pub struct ProjectCompileOutput<
     /// all build infos that were just compiled
     pub(crate) builds: Builds<C::Language>,
     /// The relationship between the source files and their imports
-    pub(crate) edges: GraphEdges<C::ParsedSources>,
+    pub(crate) edges: GraphEdges<C::Parser>,
 }
 
 impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
     ProjectCompileOutput<C, T>
 {
     /// Returns the parser used to parse the sources.
-    pub fn parser(&self) -> &C::ParsedSources {
+    pub fn parser(&self) -> &C::Parser {
         self.edges.parser()
     }
 
     /// Returns the parser used to parse the sources.
-    pub fn parser_mut(&mut self) -> &mut C::ParsedSources {
+    pub fn parser_mut(&mut self) -> &mut C::Parser {
         self.edges.parser_mut()
     }
 
@@ -475,7 +475,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler>
     }
 
     /// Returns the source graph of the project.
-    pub fn graph(&self) -> &GraphEdges<C::ParsedSources> {
+    pub fn graph(&self) -> &GraphEdges<C::Parser> {
         &self.edges
     }
 }

crates/compilers/src/compile/project.rs

@@ -146,7 +146,7 @@ pub struct ProjectCompiler<
     C: Compiler,
 > {
     /// Contains the relationship of the source files and their imports
-    edges: GraphEdges<C::ParsedSources>,
+    edges: GraphEdges<C::Parser>,
     project: &'a Project<C, T>,
     /// A mapping from a source file path to the primary profile name selected for it.
     primary_profiles: HashMap<PathBuf, &'a str>,

crates/compilers/src/compilers/mod.rs

@@ -355,7 +355,7 @@ pub trait Compiler: Send + Sync + Clone {
     /// Output data for each contract
     type CompilerContract: CompilerContract;
     /// Source parser used for resolving imports and version requirements.
-    type ParsedSources: SourceParser<ParsedSource: ParsedSource<Language = Self::Language>>;
+    type Parser: SourceParser<ParsedSource: ParsedSource<Language = Self::Language>>;
     /// Compiler settings.
     type Settings: CompilerSettings;
     /// Enum of languages supported by the compiler.

crates/compilers/src/compilers/multi.rs

@@ -318,7 +318,7 @@ impl CompilerInput for MultiCompilerInput {
 impl Compiler for MultiCompiler {
     type Input = MultiCompilerInput;
     type CompilationError = MultiCompilerError;
-    type ParsedSources = MultiCompilerParser;
+    type Parser = MultiCompilerParser;
     type Settings = MultiCompilerSettings;
     type Language = MultiCompilerLanguage;
     type CompilerContract = Contract;

crates/compilers/src/compilers/solc/mod.rs

@@ -46,7 +46,7 @@ impl Language for SolcLanguage {
 impl Compiler for SolcCompiler {
     type Input = SolcVersionedInput;
     type CompilationError = Error;
-    type ParsedSources = SolParser;
+    type Parser = SolParser;
     type Settings = SolcSettings;
     type Language = SolcLanguage;
     type CompilerContract = Contract;

crates/compilers/src/compilers/vyper/mod.rs

@@ -202,7 +202,7 @@ impl Vyper {
 impl Compiler for Vyper {
     type Settings = VyperSettings;
     type CompilationError = VyperCompilationError;
-    type ParsedSources = VyperParser;
+    type Parser = VyperParser;
     type Input = VyperVersionedInput;
     type Language = VyperLanguage;
     type CompilerContract = Contract;

crates/compilers/src/flatten.rs

@@ -192,7 +192,7 @@ impl Flattener {
         target: &Path,
     ) -> std::result::Result<Self, FlattenerError>
     where
-        C::ParsedSources: SourceParser<ParsedSource: MaybeSolData>,
+        C::Parser: SourceParser<ParsedSource: MaybeSolData>,
     {
         // Configure project to compile the target file and only request AST for target file.
         project.cached = false;
@@ -210,7 +210,7 @@ impl Flattener {
         let output = output.compiler_output;
 
         let sources = Source::read_all_files(vec![target.to_path_buf()])?;
-        let graph = Graph::<C::ParsedSources>::resolve_sources(&project.paths, sources)?;
+        let graph = Graph::<C::Parser>::resolve_sources(&project.paths, sources)?;
 
         let ordered_sources = collect_ordered_deps(target, &project.paths, &graph)?;
 

crates/compilers/src/lib.rs

@@ -175,7 +175,7 @@ where
     /// Returns standard-json-input to compile the target contract
     pub fn standard_json_input(&self, target: &Path) -> Result<StandardJsonCompilerInput> {
         trace!(?target, "Building standard-json-input");
-        let graph = Graph::<C::ParsedSources>::resolve(&self.paths)?;
+        let graph = Graph::<C::Parser>::resolve(&self.paths)?;
         let target_index = graph.files().get(target).ok_or_else(|| {
             SolcError::msg(format!("cannot resolve file at {:?}", target.display()))
         })?;
@@ -391,7 +391,7 @@ impl<T: ArtifactOutput<CompilerContract = C::CompilerContract>, C: Compiler> Pro
         T: Clone,
         C: Clone,
     {
-        let graph = Graph::<C::ParsedSources>::resolve(&self.paths)?;
+        let graph = Graph::<C::Parser>::resolve(&self.paths)?;
         let mut contracts: HashMap<String, Vec<PathBuf>> = HashMap::new();
         if !graph.is_empty() {
             for node in &graph.nodes {

crates/compilers/src/resolver/mod.rs

@@ -88,7 +88,7 @@ pub struct ResolvedSources<'a, C: Compiler> {
     /// a profile suffix.
     pub primary_profiles: HashMap<PathBuf, &'a str>,
     /// Graph edges.
-    pub edges: GraphEdges<C::ParsedSources>,
+    pub edges: GraphEdges<C::Parser>,
 }
 
 /// The underlying edges of the graph which only contains the raw relationship data.
@@ -523,7 +523,7 @@ impl<P: SourceParser> Graph<P> {
     ) -> Result<ResolvedSources<'_, C>>
     where
         T: ArtifactOutput<CompilerContract = C::CompilerContract>,
-        C: Compiler<ParsedSources = P, Language = <P::ParsedSource as ParsedSource>::Language>,
+        C: Compiler<Parser = P, Language = <P::ParsedSource as ParsedSource>::Language>,
     {
         /// insert the imports of the given node into the sources map
         /// There can be following graph: