Tidy djls-semantic structure post-split (#671)

Author: joshuadavidthomas

crates/djls-semantic/src/lib.rs

@@ -6,7 +6,6 @@ mod references;
 mod scoping;
 mod structure;
 mod tags;
-mod traits;
 mod validation;
 
 pub use db::Db;

crates/djls-semantic/src/structure.rs

@@ -29,7 +29,6 @@ pub use crate::structure::tree::Regions;
 pub use crate::structure::tree::TemplateNode;
 pub use crate::structure::tree::TemplateRegion;
 pub use crate::structure::tree::TemplateTree;
-use crate::traits::SemanticModel;
 
 #[salsa::tracked]
 pub fn build_template_tree<'db>(

crates/djls-semantic/src/structure/builder.rs

@@ -1,5 +1,6 @@
 use djls_source::Span;
 use djls_templates::Filter;
+use djls_templates::NodeList;
 use djls_templates::ParseError;
 use djls_templates::TagBit;
 use djls_templates::TagDelimiter;
@@ -17,7 +18,6 @@ use crate::structure::tree::RegionId;
 use crate::structure::tree::Regions;
 use crate::structure::tree::TemplateNode;
 use crate::structure::tree::TemplateTree;
-use crate::traits::SemanticModel;
 
 #[derive(Debug, Clone)]
 enum TreeOp {
@@ -59,6 +59,14 @@ impl<'db> TemplateTreeBuilder<'db> {
         builder
     }
 
+    pub(crate) fn model(mut self, db: &'db dyn Db, nodelist: NodeList<'db>) -> TemplateTree<'db> {
+        for node in nodelist.nodelist(db) {
+            self.visit_node(node);
+        }
+        self.finish();
+        self.apply_operations()
+    }
+
     fn alloc_region_id(&mut self, span: Span, parent: Option<RegionId>) -> RegionId {
         let id = RegionId::new(
             u32::try_from(self.region_allocs.len()).expect("template region count overflow"),
@@ -417,12 +425,3 @@ impl Visitor for TemplateTreeBuilder<'_> {
         });
     }
 }
-
-impl<'db> SemanticModel<'db> for TemplateTreeBuilder<'db> {
-    type Model = TemplateTree<'db>;
-
-    fn construct(mut self) -> Self::Model {
-        self.finish();
-        self.apply_operations()
-    }
-}