Remove SemanticBuilder and address PR comments

Author: ggiraldez

crates/solidity/outputs/cargo/crate/src/backend/passes/p1_flatten_contracts.rs

@@ -7,6 +7,10 @@ use crate::backend::ir::ir2_flat_contracts::{self as output, input};
 use crate::cst::TerminalNode;
 use crate::utils::versions::VERSION_0_5_0;
 
+/// This pass makes ergonomic changes to the AST in order to make it easier to
+/// use. It includes changes such as removing redundant intermediate nodes,
+/// unifying similar node types and computing visibility/mutability from
+/// collections of attributes.
 pub fn run_file(language_version: &Version, source_unit: &input::SourceUnit) -> output::SourceUnit {
     let mut pass = Pass {
         language_version: language_version.clone(),

crates/solidity/outputs/cargo/crate/src/backend/semantic/mod.rs

@@ -11,28 +11,6 @@ use crate::compilation::File;
 use crate::cst::{Cursor, NonterminalNode};
 use crate::parser::ParseError;
 
-pub struct SemanticBuilder {
-    language_version: Version,
-    files: Vec<Rc<File>>,
-}
-
-impl SemanticBuilder {
-    pub fn create(language_version: Version) -> Self {
-        Self {
-            language_version,
-            files: Vec::new(),
-        }
-    }
-
-    pub fn add_file(&mut self, file: Rc<File>) {
-        self.files.push(file);
-    }
-
-    pub fn build(self) -> SemanticAnalysis {
-        SemanticAnalysis::create(self.language_version, self.files)
-    }
-}
-
 #[derive(Clone)]
 pub struct SemanticFile {
     file: Rc<File>,
@@ -76,12 +54,15 @@ pub struct SemanticAnalysis {
 }
 
 impl SemanticAnalysis {
-    fn create(language_version: Version, files: Vec<Rc<File>>) -> Self {
+    pub(crate) fn create<'a>(
+        language_version: Version,
+        files: impl Iterator<Item = &'a Rc<File>>,
+    ) -> Self {
         let mut semantic_analysis = Self::new(language_version);
 
         for file in files {
             let file_id = file.id().to_string();
-            let Some(structured_ast) = passes::p0_build_ast::run_file(&file) else {
+            let Some(structured_ast) = passes::p0_build_ast::run_file(file) else {
                 // TODO(validation): the file is not valid and cannot be turned
                 // into a typed IR tree
                 continue;
@@ -90,7 +71,10 @@ impl SemanticAnalysis {
                 semantic_analysis.language_version(),
                 &structured_ast,
             );
-            let semantic_file = SemanticFile { file, ir_root };
+            let semantic_file = SemanticFile {
+                file: Rc::clone(file),
+                ir_root,
+            };
             semantic_analysis.files.insert(file_id, semantic_file);
         }
 

crates/solidity/outputs/cargo/crate/src/compilation/unit.rs

@@ -78,14 +78,11 @@ impl CompilationUnit {
     #[cfg(feature = "__private_backend_api")]
     #[doc(hidden)]
     pub fn semantic_analysis(&self) -> &Rc<SemanticAnalysis> {
-        use crate::backend::semantic::SemanticBuilder;
-
         self.semantic_analysis.get_or_init(|| {
-            let mut builder = SemanticBuilder::create(self.language_version.clone());
-            for file in self.files.values() {
-                builder.add_file(Rc::clone(file));
-            }
-            Rc::new(builder.build())
+            Rc::new(SemanticAnalysis::create(
+                self.language_version.clone(),
+                self.files.values(),
+            ))
         })
     }
 }