chore: Reduce implementation of NoDotNamesCheck trait by blanket

implementations

Author: ngeor

rusty_linter/src/post_linter/dots_linter.rs

@@ -15,72 +15,62 @@ trait NoDotNamesCheck<T, E> {
     fn ensure_no_dots(&self, x: &T) -> Result<(), E>;
 }
 
-impl NoDotNamesCheck<FunctionImplementation, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &FunctionImplementation) -> Result<(), LintErrorPos> {
-        self.ensure_no_dots(&x.name)?;
-        self.ensure_no_dots(&x.params)
-    }
-}
+// Blanket for Positioned
 
-impl NoDotNamesCheck<SubImplementation, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &SubImplementation) -> Result<(), LintErrorPos> {
-        self.ensure_no_dots(&x.name)?;
-        self.ensure_no_dots(&x.params)
+impl<T, E> NoDotNamesCheck<Positioned<T>, Positioned<E>> for DotsLinter
+where
+    DotsLinter: NoDotNamesCheck<T, E>,
+{
+    fn ensure_no_dots(&self, element: &Positioned<T>) -> Result<(), Positioned<E>> {
+        let Positioned { element, pos } = element;
+        self.ensure_no_dots(element).map_err(|e| e.at_pos(*pos))
     }
 }
 
-impl NoDotNamesCheck<Vec<Positioned<Parameter>>, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &Vec<Positioned<Parameter>>) -> Result<(), LintErrorPos> {
+// Blanket for Vec
+
+impl<T, E> NoDotNamesCheck<Vec<T>, E> for DotsLinter
+where
+    DotsLinter: NoDotNamesCheck<T, E>,
+{
+    fn ensure_no_dots(&self, x: &Vec<T>) -> Result<(), E> {
         x.iter().try_for_each(|x| self.ensure_no_dots(x))
     }
 }
 
-impl NoDotNamesCheck<Positioned<Parameter>, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &Positioned<Parameter>) -> Result<(), LintErrorPos> {
-        let Positioned { element, pos } = x;
-        self.ensure_no_dots(element).map_err(|e| e.at(pos))
+// FunctionImplementation and SubImplementation
+
+impl<T> NoDotNamesCheck<SubprogramImplementation<T>, LintErrorPos> for DotsLinter
+where
+    DotsLinter:
+        NoDotNamesCheck<Positioned<T>, LintErrorPos> + NoDotNamesCheck<Parameters, LintErrorPos>,
+{
+    fn ensure_no_dots(&self, x: &SubprogramImplementation<T>) -> Result<(), LintErrorPos> {
+        self.ensure_no_dots(&x.name)?;
+        self.ensure_no_dots(&x.params)
     }
 }
 
+// TODO the next 4 can be merged into one with a trait like AsRef<BareName>
+
 impl NoDotNamesCheck<Parameter, LintError> for DotsLinter {
     fn ensure_no_dots(&self, x: &Parameter) -> Result<(), LintError> {
         self.ensure_no_dots(&x.bare_name)
     }
 }
 
-impl NoDotNamesCheck<DimVarPos, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &DimVarPos) -> Result<(), LintErrorPos> {
-        let Positioned { element, pos } = x;
-        self.ensure_no_dots(element).map_err(|e| e.at(pos))
-    }
-}
-
 impl NoDotNamesCheck<DimVar, LintError> for DotsLinter {
     fn ensure_no_dots(&self, x: &DimVar) -> Result<(), LintError> {
         self.ensure_no_dots(&x.bare_name)
     }
 }
 
-impl NoDotNamesCheck<NamePos, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, name_pos: &NamePos) -> Result<(), LintErrorPos> {
-        let name = &name_pos.element;
-        self.ensure_no_dots(name).map_err(|e| e.at(name_pos))
-    }
-}
-
 impl NoDotNamesCheck<Name, LintError> for DotsLinter {
     fn ensure_no_dots(&self, name: &Name) -> Result<(), LintError> {
         self.ensure_no_dots(name.bare_name())
     }
 }
 
-impl NoDotNamesCheck<BareNamePos, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &BareNamePos) -> Result<(), LintErrorPos> {
-        let Positioned { element, pos } = x;
-        self.ensure_no_dots(element).map_err(|e| e.at(pos))
-    }
-}
-
 impl NoDotNamesCheck<BareName, LintError> for DotsLinter {
     fn ensure_no_dots(&self, x: &BareName) -> Result<(), LintError> {
         match x.prefix('.') {
@@ -96,12 +86,6 @@ impl NoDotNamesCheck<BareName, LintError> for DotsLinter {
     }
 }
 
-impl NoDotNamesCheck<Expressions, LintErrorPos> for DotsLinter {
-    fn ensure_no_dots(&self, x: &Expressions) -> Result<(), LintErrorPos> {
-        x.iter().try_for_each(|x| self.ensure_no_dots(x))
-    }
-}
-
 impl NoDotNamesCheck<Positioned<&Expression>, LintErrorPos> for DotsLinter {
     fn ensure_no_dots(&self, x: &Positioned<&Expression>) -> Result<(), LintErrorPos> {
         let Positioned { element, pos } = x;

rusty_linter/src/post_linter/post_linter.rs

@@ -28,27 +28,34 @@ fn apply_linters(
     let mut linter = for_next_counter_match_linter::ForNextCounterMatch::visitor();
     linter.visit(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = dots_linter::DotsLinter::default();
     linter.visit_program(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = built_in_linter::BuiltInLinter::new();
     linter.visit_program(result)?;
 
     let mut linter = print_linter::PrintLinter::visitor();
     linter.visit(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = user_defined_function_linter::UserDefinedFunctionLinter { linter_context };
     linter.visit_program(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = user_defined_sub_linter::UserDefinedSubLinter { linter_context };
     linter.visit_program(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = select_case_linter::SelectCaseLinter {};
     linter.visit_program(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = condition_type_linter::ConditionTypeLinter {};
     linter.visit_program(result)?;
 
+    // TODO migrate to Visitor
     let mut linter = label_linter::LabelLinter::default();
     linter.visit_program(result)?;
     Ok(())