Fix more clippy warnings. (#183)

Author: badmonster0

src/base/value.rs

@@ -334,7 +334,7 @@ impl<T: Into<BasicValue>> From<Vec<T>> for BasicValue {
 }
 
 impl BasicValue {
-    pub fn to_key(self) -> Result<KeyValue> {
+    pub fn into_key(self) -> Result<KeyValue> {
         let result = match self {
             BasicValue::Bytes(v) => KeyValue::Bytes(v),
             BasicValue::Str(v) => KeyValue::Str(v),
@@ -473,13 +473,13 @@ impl<VS> Value<VS> {
         matches!(self, Value::Null)
     }
 
-    pub fn to_key(self) -> Result<KeyValue> {
+    pub fn into_key(self) -> Result<KeyValue> {
         let result = match self {
-            Value::Basic(v) => v.to_key()?,
+            Value::Basic(v) => v.into_key()?,
             Value::Struct(v) => KeyValue::Struct(
                 v.fields
                     .into_iter()
-                    .map(|v| v.to_key())
+                    .map(|v| v.into_key())
                     .collect::<Result<Vec<_>>>()?,
             ),
             Value::Null | Value::Collection(_) | Value::Table(_) | Value::List(_) => {
@@ -661,7 +661,7 @@ where
         })
     }
 
-    pub fn from_json<'a>(value: serde_json::Value, fields_schema: &[FieldSchema]) -> Result<Self> {
+    pub fn from_json(value: serde_json::Value, fields_schema: &[FieldSchema]) -> Result<Self> {
         match value {
             serde_json::Value::Array(v) => {
                 if v.len() != fields_schema.len() {
@@ -821,7 +821,7 @@ where
                                         })?,
                                         &key_field.value_type.typ,
                                     )?
-                                    .to_key()?;
+                                    .into_key()?;
                                     let values = FieldValues::from_json_values(
                                         fields_iter.zip(field_vals_iter),
                                     )?;
@@ -839,7 +839,7 @@ where
                                         )?),
                                         &key_field.value_type.typ,
                                     )?
-                                    .to_key()?;
+                                    .into_key()?;
                                     let values = FieldValues::from_json_object(v, fields_iter)?;
                                     Ok((key, values.into()))
                                 }

src/builder/analyzer.rs

@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, HashSet};
 use std::sync::Mutex;
-use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc, u32};
+use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc};
 
 use super::plan::*;
 use crate::execution::db_tracking_setup;

src/builder/flow_builder.rs

@@ -408,9 +408,11 @@ impl FlowBuilder {
             flow_ctx: &self.flow_inst_context,
         };
         let mut root_data_scope = self.root_data_scope.lock().unwrap();
-        let _ = analyzer_ctx
+
+        let analyzed = analyzer_ctx
             .analyze_source_op(&mut root_data_scope, source_op.clone(), None, None)
             .into_py_result()?;
+        std::mem::drop(analyzed);
 
         let result =
             Self::last_field_to_data_slice(&root_data_scope, self.root_data_scope_ref.clone())
@@ -498,7 +500,10 @@ impl FlowBuilder {
                         op: spec,
                     }),
                 };
-                let _ = analyzer_ctx.analyze_reactive_op(scope, &reactive_op, parent_scopes)?;
+
+                let analyzed =
+                    analyzer_ctx.analyze_reactive_op(scope, &reactive_op, parent_scopes)?;
+                std::mem::drop(analyzed);
 
                 reactive_ops.push(reactive_op);
                 let result = Self::last_field_to_data_slice(scope.data, common_scope.clone())
@@ -537,7 +542,11 @@ impl FlowBuilder {
                         collector_name: collector.name.clone(),
                     }),
                 };
-                let _ = analyzer_ctx.analyze_reactive_op(scope, &reactive_op, parent_scopes)?;
+
+                let analyzed =
+                    analyzer_ctx.analyze_reactive_op(scope, &reactive_op, parent_scopes)?;
+                std::mem::drop(analyzed);
+
                 reactive_ops.push(reactive_op);
                 Ok(())
             },

src/execution/evaluator.rs

@@ -325,7 +325,7 @@ async fn evaluate_op_scope(
                             .fingerprinter
                             .clone()
                             .with(&input_values)?
-                            .to_fingerprint();
+                            .into_fingerprint();
                         Some(cache.get(
                             key,
                             &op.function_exec_info.output_type,
@@ -426,7 +426,7 @@ async fn evaluate_op_scope(
     Ok(())
 }
 
-pub async fn evaluate_source_entry<'a>(
+pub async fn evaluate_source_entry(
     plan: &ExecutionPlan,
     source_op_idx: usize,
     schema: &schema::DataSchema,

src/execution/indexer.rs

@@ -222,7 +222,7 @@ async fn precommit_source_tracking_info(
                 let curr_fp = Some(
                     Fingerprinter::default()
                         .with(&field_values)?
-                        .to_fingerprint(),
+                        .into_fingerprint(),
                 );
 
                 let existing_target_keys = target_info.existing_keys_info.remove(&primary_key_json);
@@ -437,7 +437,7 @@ pub async fn evaluation_cache_on_existing_data(
     ))
 }
 
-pub async fn update_source_entry<'a>(
+pub async fn update_source_entry(
     plan: &ExecutionPlan,
     source_op_idx: usize,
     schema: &schema::DataSchema,

src/execution/memoization.rs

@@ -133,10 +133,10 @@ impl EvaluationCache {
     }
 }
 
-pub async fn evaluate_with_cell<'a, Fut>(
-    cell: Option<&'a CacheEntryCell>,
+pub async fn evaluate_with_cell<Fut>(
+    cell: Option<&CacheEntryCell>,
     compute: impl FnOnce() -> Fut,
-) -> Result<Cow<'a, value::Value>>
+) -> Result<Cow<'_, value::Value>>
 where
     Fut: Future<Output = Result<value::Value>>,
 {

src/ops/factory_bases.rs

@@ -26,8 +26,8 @@ pub struct ResolvedOpArg {
 
 pub trait ResolvedOpArgExt: Sized {
     fn expect_type(self, expected_type: &ValueType) -> Result<Self>;
-    fn value<'a>(&self, args: &'a Vec<value::Value>) -> Result<&'a value::Value>;
-    fn take_value(&self, args: &mut Vec<value::Value>) -> Result<value::Value>;
+    fn value<'a>(&self, args: &'a [value::Value]) -> Result<&'a value::Value>;
+    fn take_value(&self, args: &mut [value::Value]) -> Result<value::Value>;
 }
 
 impl ResolvedOpArgExt for ResolvedOpArg {
@@ -43,7 +43,7 @@ impl ResolvedOpArgExt for ResolvedOpArg {
         Ok(self)
     }
 
-    fn value<'a>(&self, args: &'a Vec<value::Value>) -> Result<&'a value::Value> {
+    fn value<'a>(&self, args: &'a [value::Value]) -> Result<&'a value::Value> {
         if self.idx >= args.len() {
             api_bail!(
                 "Two few arguments, {} provided, expected at least {} for `{}`",
@@ -55,7 +55,7 @@ impl ResolvedOpArgExt for ResolvedOpArg {
         Ok(&args[self.idx])
     }
 
-    fn take_value(&self, args: &mut Vec<value::Value>) -> Result<value::Value> {
+    fn take_value(&self, args: &mut [value::Value]) -> Result<value::Value> {
         if self.idx >= args.len() {
             api_bail!(
                 "Two few arguments, {} provided, expected at least {} for `{}`",
@@ -73,15 +73,15 @@ impl ResolvedOpArgExt for Option<ResolvedOpArg> {
         self.map(|arg| arg.expect_type(expected_type)).transpose()
     }
 
-    fn value<'a>(&self, args: &'a Vec<value::Value>) -> Result<&'a value::Value> {
+    fn value<'a>(&self, args: &'a [value::Value]) -> Result<&'a value::Value> {
         Ok(self
             .as_ref()
             .map(|arg| arg.value(args))
             .transpose()?
             .unwrap_or(&value::Value::Null))
     }
 
-    fn take_value(&self, args: &mut Vec<value::Value>) -> Result<value::Value> {
+    fn take_value(&self, args: &mut [value::Value]) -> Result<value::Value> {
         Ok(self
             .as_ref()
             .map(|arg| arg.take_value(args))

src/ops/storages/postgres.rs

@@ -46,12 +46,10 @@ fn key_value_fields_iter<'a>(
 
 fn convertible_to_pgvector(vec_schema: &VectorTypeSchema) -> bool {
     if vec_schema.dimension.is_some() {
-        match &*vec_schema.element_type {
-            BasicValueType::Float32 => true,
-            BasicValueType::Float64 => true,
-            BasicValueType::Int64 => true,
-            _ => false,
-        }
+        matches!(
+            *vec_schema.element_type,
+            BasicValueType::Float32 | BasicValueType::Float64 | BasicValueType::Int64
+        )
     } else {
         false
     }
@@ -468,8 +466,8 @@ pub struct SetupState {
 impl SetupState {
     fn new(
         table_id: &TableId,
-        key_fields_schema: &Vec<FieldSchema>,
-        value_fields_schema: &Vec<FieldSchema>,
+        key_fields_schema: &[FieldSchema],
+        value_fields_schema: &[FieldSchema],
         index_options: &IndexOptions,
     ) -> Self {
         Self {

src/py/convert.rs

@@ -199,7 +199,7 @@ pub fn value_from_py_object<'py>(
                             .into_iter()
                             .map(|v| {
                                 let mut iter = v.fields.into_iter();
-                                let key = iter.next().unwrap().to_key().into_py_result()?;
+                                let key = iter.next().unwrap().into_key().into_py_result()?;
                                 Ok((
                                     key,
                                     value::ScopeValue(value::FieldValues {

src/setup/states.rs

@@ -1,3 +1,16 @@
+/// Concepts:
+/// - Resource: some setup that needs to be tracked and maintained.
+/// - Setup State: current state of a resource.
+/// - Staging Change: states changes that may not be really applied yet.
+/// - Combined Setup State: Setup State + Staging Change.
+/// - Status Check: information about changes that are being applied / need to be applied.
+///
+/// Resource hierarchy:
+/// - [resource: setup metadata table] /// - Flow
+///   - [resource: metadata]
+///   - [resource: tracking table]
+///   - Target
+///     - [resource: target-specific stuff]
 use anyhow::Result;
 use axum::async_trait;
 use indenter::indented;
@@ -15,20 +28,6 @@ use crate::execution::db_tracking_setup;
 
 const INDENT: &str = "    ";
 
-/// Concepts:
-/// - Resource: some setup that needs to be tracked and maintained.
-/// - Setup State: current state of a resource.
-/// - Staging Change: states changes that may not be really applied yet.
-/// - Combined Setup State: Setup State + Staging Change.
-/// - Status Check: information about changes that are being applied / need to be applied.
-///
-/// Resource hierarchy:
-/// - [resource: setup metadata table] /// - Flow
-///   - [resource: metadata]
-///   - [resource: tracking table]
-///   - Target
-///     - [resource: target-specific stuff]
-
 pub trait StateMode: Clone + Copy {
     type State<T: Debug + Clone>: Debug + Clone;
     type DefaultState<T: Debug + Clone + Default>: Debug + Clone + Default;