Clippy

lib/chrontext/src/combiner.rs

@@ -80,7 +80,7 @@ pub struct Combiner {
 }
 
 impl Combiner {
-    pub fn new<'py>(
+    pub fn new(
         sparql_database: Arc<dyn SparqlQueryable>,
         pushdown_settings: HashSet<PushdownSetting>,
         virtualized_database: Arc<VirtualizedDatabase>,

lib/chrontext/src/combiner/lazy_graph_patterns/extend.rs

@@ -18,6 +18,7 @@ use virtualized_query::VirtualizedQuery;
 
 impl Combiner {
     #[async_recursion]
+    #[allow(clippy::too_many_arguments)]
     pub(crate) async fn lazy_extend(
         &mut self,
         inner: &GraphPattern,

lib/chrontext/src/combiner/lazy_graph_patterns/group.rs

@@ -15,11 +15,12 @@ use std::collections::HashMap;
 use virtualized_query::VirtualizedQuery;
 
 impl Combiner {
+    #[allow(clippy::too_many_arguments)]
     pub(crate) async fn lazy_group(
         &mut self,
         inner: &GraphPattern,
-        variables: &Vec<Variable>,
-        aggregates: &Vec<(Variable, AggregateExpression)>,
+        variables: &[Variable],
+        aggregates: &[(Variable, AggregateExpression)],
         solution_mapping: Option<SolutionMappings>,
         mut static_query_map: HashMap<Context, Query>,
         mut prepared_virtualized_queries: Option<HashMap<Context, Vec<VirtualizedQuery>>>,

lib/chrontext/src/combiner/lazy_graph_patterns/left_join.rs

@@ -17,6 +17,7 @@ use virtualized_query::VirtualizedQuery;
 
 impl Combiner {
     #[async_recursion]
+    #[allow(clippy::too_many_arguments)]
     pub(crate) async fn lazy_left_join(
         &mut self,
         left: &GraphPattern,

lib/chrontext/src/combiner/lazy_graph_patterns/slice.rs

@@ -13,6 +13,7 @@ use virtualized_query::VirtualizedQuery;
 
 impl Combiner {
     #[async_recursion]
+    #[allow(clippy::too_many_arguments)]
     pub(crate) async fn lazy_slice(
         &mut self,
         inner: &GraphPattern,

lib/chrontext/src/preparing/expressions/coalesce_expression.rs

@@ -8,7 +8,7 @@ use std::collections::HashMap;
 impl TimeseriesQueryPrepper {
     pub fn prepare_coalesce_expression(
         &mut self,
-        wrapped: &Vec<Expression>,
+        wrapped: &[Expression],
         try_groupby_complex_query: bool,
         solution_mappings: &mut SolutionMappings,
         context: &Context,

lib/chrontext/src/preparing/expressions/function_call_expression.rs

@@ -9,7 +9,7 @@ impl TimeseriesQueryPrepper {
     pub fn prepare_function_call_expression(
         &mut self,
         _fun: &Function,
-        args: &Vec<Expression>,
+        args: &[Expression],
         try_groupby_complex_query: bool,
         solution_mappings: &mut SolutionMappings,
         context: &Context,

lib/chrontext/src/preparing/expressions/in_expression.rs

@@ -8,7 +8,7 @@ impl TimeseriesQueryPrepper {
     pub fn prepare_in_expression(
         &mut self,
         left: &Expression,
-        expressions: &Vec<Expression>,
+        expressions: &[Expression],
         try_groupby_complex_query: bool,
         solution_mappings: &mut SolutionMappings,
         context: &Context,

lib/chrontext/src/preparing/graph_patterns/group_pattern.rs

@@ -75,7 +75,7 @@ impl TimeseriesQueryPrepper {
     fn add_grouping_col(
         &mut self,
         solution_mappings: &mut SolutionMappings,
-        by: &Vec<Variable>,
+        by: &[Variable],
     ) -> String {
         let grouping_col = format!("{}_{}", GROUPING_COL, self.grouping_counter);
         self.grouping_counter += 1;

lib/chrontext/src/preparing/graph_patterns/project_pattern.rs

@@ -9,7 +9,7 @@ impl TimeseriesQueryPrepper {
     pub fn prepare_project(
         &mut self,
         inner: &GraphPattern,
-        _variables: &Vec<Variable>,
+        _variables: &[Variable],
         try_groupby_complex_query: bool,
         solution_mappings: &mut SolutionMappings,
         context: &Context,

lib/chrontext/src/preparing/graph_patterns/values_pattern.rs

@@ -8,8 +8,8 @@ use spargebra::term::GroundTerm;
 impl TimeseriesQueryPrepper {
     pub fn prepare_values(
         &mut self,
-        _variables: &Vec<Variable>,
-        _bindings: &Vec<Vec<Option<GroundTerm>>>,
+        _variables: &[Variable],
+        _bindings: &[Vec<Option<GroundTerm>>],
     ) -> GPPrepReturn {
         GPPrepReturn::new(HashMap::new())
     }

lib/chrontext/src/rewriting/expressions/and_expression.rs

@@ -33,8 +33,8 @@ impl StaticQueryRewriter {
             &context.extension_with(PathEntry::AndRight),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut left_rewrite)
-            .with_is_subquery(&mut right_rewrite);
+        exr.with_is_subquery(&left_rewrite)
+            .with_is_subquery(&right_rewrite);
         if left_rewrite.expression.is_some()
             && right_rewrite.expression.is_some()
             && left_rewrite.change_type.as_ref().unwrap() == &ChangeType::NoChange

lib/chrontext/src/rewriting/expressions/binary_ordinary_expression.rs

@@ -97,8 +97,8 @@ impl StaticQueryRewriter {
             &context.extension_with(right_path_entry),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut left_rewrite)
-            .with_is_subquery(&mut right_rewrite);
+        exr.with_is_subquery(&left_rewrite)
+            .with_is_subquery(&right_rewrite);
         if left_rewrite.expression.is_some()
             && left_rewrite.change_type.as_ref().unwrap() == &ChangeType::NoChange
             && right_rewrite.expression.is_some()

lib/chrontext/src/rewriting/expressions/coalesce_expression.rs

@@ -9,7 +9,7 @@ use std::collections::HashSet;
 impl StaticQueryRewriter {
     pub fn rewrite_coalesce_expression(
         &mut self,
-        wrapped: &Vec<Expression>,
+        wrapped: &[Expression],
         variables_in_scope: &HashSet<Variable>,
         create_subquery: bool,
         context: &Context,

lib/chrontext/src/rewriting/expressions/function_call_expression.rs

@@ -10,7 +10,7 @@ impl StaticQueryRewriter {
     pub fn rewrite_function_call_expression(
         &mut self,
         fun: &Function,
-        args: &Vec<Expression>,
+        args: &[Expression],
         variables_in_scope: &HashSet<Variable>,
         create_subquery: bool,
         context: &Context,

lib/chrontext/src/rewriting/expressions/if_expression.rs

@@ -23,7 +23,7 @@ impl StaticQueryRewriter {
             create_subquery,
             &context.extension_with(PathEntry::IfLeft),
         );
-        let mut mid_rewrite = self.rewrite_expression(
+        let mid_rewrite = self.rewrite_expression(
             mid,
             &ChangeType::NoChange,
             variables_in_scope,
@@ -38,9 +38,9 @@ impl StaticQueryRewriter {
             &context.extension_with(PathEntry::IfRight),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut left_rewrite)
-            .with_is_subquery(&mut mid_rewrite)
-            .with_is_subquery(&mut right_rewrite);
+        exr.with_is_subquery(&left_rewrite)
+            .with_is_subquery(&mid_rewrite)
+            .with_is_subquery(&right_rewrite);
         if left_rewrite.expression.is_some()
             && left_rewrite.change_type.as_ref().unwrap() == &ChangeType::NoChange
             && mid_rewrite.expression.is_some()

lib/chrontext/src/rewriting/expressions/in_expression.rs

@@ -10,7 +10,7 @@ impl StaticQueryRewriter {
     pub fn rewrite_in_expression(
         &mut self,
         left: &Expression,
-        expressions: &Vec<Expression>,
+        expressions: &[Expression],
         required_change_direction: &ChangeType,
         variables_in_scope: &HashSet<Variable>,
         create_subquery: bool,
@@ -37,7 +37,7 @@ impl StaticQueryRewriter {
             })
             .collect::<Vec<ExReturn>>();
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut left_rewrite);
+        exr.with_is_subquery(&left_rewrite);
         for rw_exr in expressions_rewritten.iter_mut() {
             exr.with_is_subquery(rw_exr);
         }

lib/chrontext/src/rewriting/expressions/not_expression.rs

@@ -23,7 +23,7 @@ impl StaticQueryRewriter {
             &context.extension_with(PathEntry::Not),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut wrapped_rewrite);
+        exr.with_is_subquery(&wrapped_rewrite);
         if wrapped_rewrite.expression.is_some() {
             let wrapped_change = wrapped_rewrite.change_type.take().unwrap();
             let use_change_type = match wrapped_change {

lib/chrontext/src/rewriting/expressions/or_expression.rs

@@ -31,8 +31,8 @@ impl StaticQueryRewriter {
             &context.extension_with(PathEntry::OrRight),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut left_rewrite)
-            .with_is_subquery(&mut right_rewrite);
+        exr.with_is_subquery(&left_rewrite)
+            .with_is_subquery(&right_rewrite);
         if left_rewrite.expression.is_some()
             && right_rewrite.expression.is_some()
             && left_rewrite.change_type.as_ref().unwrap() == &ChangeType::NoChange

lib/chrontext/src/rewriting/expressions/unary_ordinary_expression.rs

@@ -32,7 +32,7 @@ impl StaticQueryRewriter {
             &context.extension_with(path_entry),
         );
         let mut exr = ExReturn::new();
-        exr.with_is_subquery(&mut wrapped_rewrite);
+        exr.with_is_subquery(&wrapped_rewrite);
         if wrapped_rewrite.expression.is_some()
             && wrapped_rewrite.change_type.as_ref().unwrap() == &ChangeType::NoChange
         {

lib/chrontext/src/rewriting/graph_patterns/group_pattern.rs

@@ -9,8 +9,8 @@ impl StaticQueryRewriter {
     pub fn rewrite_group(
         &mut self,
         graph_pattern: &GraphPattern,
-        variables: &Vec<Variable>,
-        aggregates: &Vec<(Variable, AggregateExpression)>,
+        variables: &[Variable],
+        aggregates: &[(Variable, AggregateExpression)],
         context: &Context,
     ) -> GPReturn {
         let inner_context = context.extension_with(PathEntry::GroupInner);

lib/chrontext/src/rewriting/graph_patterns/project_pattern.rs

@@ -8,7 +8,7 @@ impl StaticQueryRewriter {
     pub fn rewrite_project(
         &mut self,
         inner: &GraphPattern,
-        variables: &Vec<Variable>,
+        variables: &[Variable],
         context: &Context,
     ) -> GPReturn {
         let mut inner_rewrite =

lib/chrontext/src/rewriting/graph_patterns/values_pattern.rs

@@ -9,7 +9,7 @@ impl StaticQueryRewriter {
     pub fn rewrite_values(
         &mut self,
         variables: &[Variable],
-        bindings: &Vec<Vec<Option<GroundTerm>>>,
+        bindings: &[Vec<Option<GroundTerm>>],
     ) -> GPReturn {
         GPReturn::new(
             GraphPattern::Values {