simplify a bit

Author: joshuadavidthomas

Cargo.lock

@@ -9,9 +9,8 @@ djls-semantic = { workspace = true }
 djls-templates = { workspace = true }
 djls-workspace = { workspace = true }
 
+salsa = { workspace = true }
 tower-lsp-server = { workspace = true }
 
-[dev-dependencies]
-
 [lints]
 workspace = true

crates/djls-ide/Cargo.toml

@@ -8,7 +8,6 @@ pub use builtins::django_builtin_specs;
 pub use db::Db;
 pub use db::ValidationErrorAccumulator;
 pub use errors::ValidationError;
-use salsa::Accumulator;
 pub use specs::ArgType;
 pub use specs::EndTag;
 pub use specs::IntermediateTag;
@@ -18,6 +17,8 @@ pub use specs::TagSpec;
 pub use specs::TagSpecs;
 pub use validation::TagValidator;
 
+use salsa::Accumulator;
+
 /// Validate a Django template node list and return validation errors.
 ///
 /// This function runs the TagValidator on the parsed node list to check for:
@@ -35,6 +36,6 @@ pub fn validate_nodelist(db: &dyn Db, nodelist: djls_templates::NodeList<'_>) {
     let validation_errors = TagValidator::new(db, nodelist).validate();
 
     for error in validation_errors {
-        db::ValidationErrorAccumulator(error).accumulate(db);
+        ValidationErrorAccumulator(error).accumulate(db);
     }
 }

crates/djls-semantic/src/lib.rs

@@ -105,14 +105,13 @@ pub fn parse_template(db: &dyn Db, file: SourceFile) -> Option<NodeList<'_>> {
         Ok((nodelist, errors)) => {
             for error in errors {
                 let template_error = TemplateError::Parser(error.to_string());
-                accumulate_error(db, &template_error, nodelist.line_offsets(db));
+                TemplateErrorAccumulator(template_error).accumulate(db);
             }
             nodelist
         }
         Err(err) => {
             let template_error = TemplateError::Parser(err.to_string());
-            let empty_offsets = LineOffsets::default();
-            accumulate_error(db, &template_error, &empty_offsets);
+            TemplateErrorAccumulator(template_error).accumulate(db);
 
             let empty_nodelist = Vec::new();
             let empty_offsets = LineOffsets::default();
@@ -122,9 +121,3 @@ pub fn parse_template(db: &dyn Db, file: SourceFile) -> Option<NodeList<'_>> {
 
     Some(nodelist)
 }
-
-fn accumulate_error(db: &dyn Db, error: &TemplateError, _line_offsets: &LineOffsets) {
-    use crate::db::TemplateErrorAccumulator;
-
-    TemplateErrorAccumulator(error.clone()).accumulate(db);
-}