refactor: Merge HasFunctions and HasSubs into one trait

`HasSubprograms`

Author: ngeor

rusty_linter/src/converter/common/context.rs

@@ -16,13 +16,10 @@ impl TypeResolver for Context {
     }
 }
 
-impl HasFunctions for Context {
+impl HasSubprograms for Context {
     fn functions(&self) -> &SignatureMap {
         self.pre_linter_result.functions()
     }
-}
-
-impl HasSubs for Context {
     fn subs(&self) -> &SignatureMap {
         self.pre_linter_result.subs()
     }

rusty_linter/src/converter/dim_rules/validation.rs

@@ -1,6 +1,6 @@
 use crate::converter::common::Context;
 use crate::core::IntoTypeQualifier;
-use crate::core::{HasFunctions, HasSubs, HasUserDefinedTypes};
+use crate::core::{HasSubprograms, HasUserDefinedTypes};
 use crate::core::{LintError, LintErrorPos};
 use crate::names::ManyNamesTrait;
 use rusty_common::{AtPos, Position, Positioned};
@@ -24,7 +24,7 @@ where
     cannot_clash_with_local_constants(var_name, ctx, pos)
 }
 
-fn cannot_clash_with_subs<T, C: HasSubs>(
+fn cannot_clash_with_subs<T, C: HasSubprograms>(
     var_name: &TypedName<T>,
     ctx: &C,
     pos: Position,

rusty_linter/src/converter/expr_rules/variable.rs

@@ -1,7 +1,7 @@
 use crate::converter::common::{Context, ExprContext, ExprContextPos};
 use crate::converter::expr_rules::qualify_name::*;
 use crate::core::{
-    qualifier_of_const_variant, HasSubs, IntoQualified, IntoTypeQualifier, LintResult,
+    qualifier_of_const_variant, HasSubprograms, IntoQualified, IntoTypeQualifier, LintResult,
 };
 use crate::core::{LintError, LintErrorPos};
 use crate::names::ManyNamesTrait;

rusty_linter/src/converter/statement/const_rules.rs

@@ -1,6 +1,6 @@
 use crate::converter::common::Context;
 use crate::core::ConstValueResolver;
-use crate::core::{qualifier_of_const_variant, CastVariant, HasFunctions, HasSubs, LintResult};
+use crate::core::{qualifier_of_const_variant, CastVariant, HasSubprograms, LintResult};
 use crate::core::{LintError, LintErrorPos};
 use rusty_common::*;
 use rusty_parser::*;

rusty_linter/src/core/traits.rs

@@ -3,11 +3,8 @@ use rusty_parser::{
     Expression, ExpressionPos, ExpressionType, HasExpressionType, TypeQualifier, UserDefinedTypes,
 };
 
-pub trait HasFunctions {
+pub trait HasSubprograms {
     fn functions(&self) -> &SignatureMap;
-}
-
-pub trait HasSubs {
     fn subs(&self) -> &SignatureMap;
 }
 

rusty_linter/src/post_linter/post_linter.rs

@@ -1,5 +1,5 @@
+use crate::core::HasSubprograms;
 use crate::core::LintErrorPos;
-use crate::core::{HasFunctions, HasSubs};
 use crate::post_linter::expression_reducer::ExpressionReducer;
 use crate::post_linter::post_conversion_linter::PostConversionLinter;
 use crate::post_linter::{
@@ -11,7 +11,7 @@ use rusty_parser::Program;
 
 pub fn post_linter(
     result: Program,
-    linter_context: &(impl HasFunctions + HasSubs),
+    linter_context: &impl HasSubprograms,
 ) -> Result<Program, LintErrorPos> {
     // lint
     apply_linters(&result, linter_context)?;
@@ -22,7 +22,7 @@ pub fn post_linter(
 
 fn apply_linters(
     result: &Program,
-    linter_context: &(impl HasFunctions + HasSubs),
+    linter_context: &impl HasSubprograms,
 ) -> Result<(), LintErrorPos> {
     let mut linter = for_next_counter_match_linter::ForNextCounterMatch {};
     linter.visit_program(result)?;

rusty_linter/src/post_linter/undefined_function_reducer.rs

@@ -1,6 +1,6 @@
 use super::expression_reducer::*;
 use crate::core::binary_cast;
-use crate::core::HasFunctions;
+use crate::core::HasSubprograms;
 use crate::core::LintErrorPos;
 use rusty_parser::Expression;
 
@@ -11,7 +11,7 @@ pub struct UndefinedFunctionReducer<'a, R> {
 
 impl<'a, R> ExpressionReducer for UndefinedFunctionReducer<'a, R>
 where
-    R: HasFunctions,
+    R: HasSubprograms,
 {
     fn visit_expression(&mut self, expression: Expression) -> Result<Expression, LintErrorPos> {
         match expression {

rusty_linter/src/post_linter/user_defined_function_linter.rs

@@ -152,7 +152,7 @@ fn has_at_least_one_arg(opt_args: Option<&Expressions>) -> bool {
 
 impl<'a, R> UserDefinedFunctionLinter<'a, R>
 where
-    R: HasFunctions,
+    R: HasSubprograms,
 {
     fn visit_function(
         &self,
@@ -198,7 +198,7 @@ where
 
 impl<'a, R> PostConversionLinter for UserDefinedFunctionLinter<'a, R>
 where
-    R: HasFunctions,
+    R: HasSubprograms,
 {
     fn visit_expression(&mut self, expr_pos: &ExpressionPos) -> Result<(), LintErrorPos> {
         let Positioned { element: e, pos } = expr_pos;

rusty_linter/src/post_linter/user_defined_sub_linter.rs

@@ -1,6 +1,6 @@
 use super::post_conversion_linter::PostConversionLinter;
 use super::user_defined_function_linter::lint_call_args;
-use crate::core::HasSubs;
+use crate::core::HasSubprograms;
 use crate::core::{LintError, LintErrorPos};
 use rusty_common::*;
 use rusty_parser::Expressions;
@@ -11,7 +11,7 @@ pub struct UserDefinedSubLinter<'a, R> {
 
 impl<'a, R> PostConversionLinter for UserDefinedSubLinter<'a, R>
 where
-    R: HasSubs,
+    R: HasSubprograms,
 {
     fn visit_sub_call(
         &mut self,

rusty_linter/src/pre_linter/pre_linter_result.rs

@@ -1,7 +1,7 @@
 use rusty_parser::UserDefinedTypes;
 
 use crate::{
-    core::{HasFunctions, HasSubs, SignatureMap},
+    core::{HasSubprograms, SignatureMap},
     HasUserDefinedTypes,
 };
 
@@ -32,13 +32,10 @@ impl From<PreLinterResult> for UserDefinedTypes {
     }
 }
 
-impl HasFunctions for PreLinterResult {
+impl HasSubprograms for PreLinterResult {
     fn functions(&self) -> &SignatureMap {
         &self.functions
     }
-}
-
-impl HasSubs for PreLinterResult {
     fn subs(&self) -> &SignatureMap {
         &self.subs
     }