Appease pedantic clippy

Author: sd2k

backend/src/convert.rs

@@ -38,7 +38,7 @@ fn unsupported_type_field(n: usize, type_: &Type, name: &str) -> data::Field {
 /// If the rows do not return the `MZ_TIMESTAMP` or `MZ_DIFF` columns
 /// they will be added automatically using the current timestamp and `None`
 /// as values respectively.
-pub fn rows_to_frame(rows: Vec<Row>) -> data::Frame {
+pub fn rows_to_frame(rows: &[Row]) -> data::Frame {
     let mut frame = data::Frame::new("tail");
     if rows.is_empty() {
         return frame;
@@ -51,14 +51,14 @@ pub fn rows_to_frame(rows: Vec<Row>) -> data::Frame {
     );
     if !has_mz_timestamp {
         let now = Utc::now();
-        frame.add_field(iter::repeat(now).take(rows.len()).into_field(MZ_TIMESTAMP))
+        frame.add_field(iter::repeat(now).take(rows.len()).into_field(MZ_TIMESTAMP));
     }
     if !has_mz_diff {
         frame.add_field(
             iter::repeat::<Option<i64>>(None)
                 .take(rows.len())
                 .into_opt_field(MZ_DIFF),
-        )
+        );
     }
 
     for (i, column) in rows[0].columns().iter().enumerate() {
@@ -73,14 +73,14 @@ pub fn rows_to_frame(rows: Vec<Row>) -> data::Frame {
                 .into_opt_field(name)
         } else {
             match column.type_() {
-                &Type::CHAR => load_field::<i8>(&rows, i, name),
-                &Type::INT2 => load_field::<i16>(&rows, i, name),
-                &Type::INT4 => load_field::<i32>(&rows, i, name),
-                &Type::INT8 => load_field::<i64>(&rows, i, name),
-                &Type::FLOAT4 => load_field::<f32>(&rows, i, name),
-                &Type::FLOAT8 => load_field::<f64>(&rows, i, name),
-                &Type::OID => load_field::<u32>(&rows, i, name),
-                &Type::TEXT | &Type::VARCHAR => load_field::<String>(&rows, i, name),
+                &Type::CHAR => load_field::<i8>(rows, i, name),
+                &Type::INT2 => load_field::<i16>(rows, i, name),
+                &Type::INT4 => load_field::<i32>(rows, i, name),
+                &Type::INT8 => load_field::<i64>(rows, i, name),
+                &Type::FLOAT4 => load_field::<f32>(rows, i, name),
+                &Type::FLOAT8 => load_field::<f64>(rows, i, name),
+                &Type::OID => load_field::<u32>(rows, i, name),
+                &Type::TEXT | &Type::VARCHAR => load_field::<String>(rows, i, name),
                 &Type::JSON | &Type::JSONB => rows
                     .iter()
                     .map(|row| row.get::<_, serde_json::Value>(i).to_string())
@@ -89,9 +89,9 @@ pub fn rows_to_frame(rows: Vec<Row>) -> data::Frame {
                     .iter()
                     .map(|row| row.get::<_, Decimal>(i).to_i64())
                     .into_opt_field(name),
-                &Type::DATE => load_field::<NaiveDate>(&rows, i, name),
-                &Type::TIMESTAMP => load_field::<NaiveDateTime>(&rows, i, name),
-                &Type::TIMESTAMPTZ => load_field::<DateTime<Utc>>(&rows, i, name),
+                &Type::DATE => load_field::<NaiveDate>(rows, i, name),
+                &Type::TIMESTAMP => load_field::<NaiveDateTime>(rows, i, name),
+                &Type::TIMESTAMPTZ => load_field::<DateTime<Utc>>(rows, i, name),
                 other => unsupported_type_field(rows.len(), other, name),
             }
         };

backend/src/data.rs

@@ -43,7 +43,7 @@ async fn query_data_single(
     let q: Query = serde_json::from_value(query.json).map_err(Error::InvalidQuery)?;
     let target = q.as_tail()?;
     let rows = target.select_all(&client).await?;
-    let mut frame = rows_to_frame(rows);
+    let mut frame = rows_to_frame(&rows);
 
     if let TailTarget::Select { statement } = target {
         let query_id = QueryId::from_statement(statement);

backend/src/stream.rs

@@ -6,7 +6,7 @@ use tracing::debug;
 use crate::{queries::Query, rows_to_frame, Error, MaterializePlugin, Result};
 
 /// Convert a Grafana Plugin SDK Frame to some initial data to send to new subscribers.
-fn frame_to_initial_data(frame: data::Frame) -> Result<backend::InitialData> {
+fn frame_to_initial_data(frame: &data::Frame) -> Result<backend::InitialData> {
     let checked = frame.check()?;
     Ok(backend::InitialData::from_frame(
         checked,
@@ -37,7 +37,7 @@ impl backend::StreamService for MaterializePlugin {
 
         Ok(backend::SubscribeStreamResponse::new(
             backend::SubscribeStreamStatus::Ok,
-            Some(frame_to_initial_data(rows_to_frame(initial_rows))?),
+            Some(frame_to_initial_data(&rows_to_frame(&initial_rows))?),
         ))
     }
 
@@ -64,7 +64,7 @@ impl backend::StreamService for MaterializePlugin {
                 .await?
                 .map_err(Error::Connection)
                 .and_then(|row| async {
-                    rows_to_frame(vec![row])
+                    rows_to_frame(&[row])
                         .check()
                         .map_err(Error::Data)
                         .and_then(|f| Ok(backend::StreamPacket::from_frame(f)?))

xtask/src/main.rs

@@ -15,7 +15,7 @@ fn print_help() {
         "Tasks:
 watch [release]      watch for changes, then compile plugin (optionally in release mode), replace in `dist` directory, and restart plugin process
 "
-    )
+    );
 }
 
 fn go_target() -> Result<String, Box<dyn Error>> {