cargo clippy fix

Author: KSDaemon

packages/cubejs-backend-native/src/node_export.rs

@@ -565,9 +565,9 @@ fn transform_query_data(mut cx: FunctionContext) -> JsResult<JsObject> {
     let transformed = match transform_data(
         alias_to_member_name_map,
         annotation,
-        &**cube_store_result,
+        &cube_store_result,
         query,
-        &query_type,
+        query_type,
         res_type.clone(),
     ) {
         Ok(data) => data,
@@ -603,7 +603,7 @@ fn final_cubestore_result(mut cx: FunctionContext) -> JsResult<JsArrayBuffer> {
 
     if let Err(err) = get_final_cubestore_result(
         &transform_request_data,
-        &**cube_store_result,
+        &cube_store_result,
         &mut result_data,
     ) {
         return cx.throw_error(err.to_string());
@@ -636,7 +636,7 @@ fn final_cubestore_result_multi(mut cx: FunctionContext) -> JsResult<JsArrayBuff
 
             match serde_json::from_str::<TransformDataRequest>(&js_string) {
                 Ok(request) => Ok(request),
-                Err(err) => return cx.throw_error(err.to_string()),
+                Err(err) => cx.throw_error(err.to_string()),
             }
         })
         .collect::<Result<_, _>>()?;

rust/cubeorchestrator/src/cubestore_result_transform.rs

@@ -30,13 +30,13 @@ pub fn get_date_range_value(time_dimensions: Option<&Vec<QueryTimeDimension>>) -
         None => bail!("QueryTimeDimension should be specified for the compare date range query."),
     };
 
-    let dim = match time_dimensions.get(0) {
+    let dim = match time_dimensions.first() {
         Some(dim) => dim,
         None => bail!("No time dimension provided."),
     };
 
     let date_range: &Vec<String> = match &dim.date_range {
-        Some(date_range) => date_range.as_ref(),
+        Some(date_range) => date_range,
         None => bail!("Inconsistent QueryTimeDimension configuration: dateRange required."),
     };
 
@@ -165,7 +165,7 @@ pub fn get_compact_row(
     query_type: &QueryType,
     members: &[String],
     time_dimensions: Option<&Vec<QueryTimeDimension>>,
-    db_row: &Vec<String>,
+    db_row: &[String],
     columns_pos: &HashMap<String, usize>,
 ) -> Result<Vec<String>> {
     let mut row: Vec<String> = Vec::with_capacity(members.len());
@@ -213,7 +213,7 @@ pub fn get_vanilla_row(
     annotation: &HashMap<String, ConfigItem>,
     query_type: &QueryType,
     query: &NormalizedQuery,
-    db_row: &Vec<String>,
+    db_row: &[String],
     columns_pos: &HashMap<String, usize>,
 ) -> Result<HashMap<String, String>> {
     let mut row = HashMap::new();
@@ -293,7 +293,7 @@ pub fn transform_data(
     let members_to_alias_map = get_members(
         query_type,
         query,
-        &data,
+        data,
         alias_to_member_name_map,
         annotation,
     )?;
@@ -311,7 +311,7 @@ pub fn transform_data(
                         query_type,
                         &members,
                         query.time_dimensions.as_ref(),
-                        &row,
+                        row,
                         &data.columns_pos,
                     )
                 })
@@ -328,7 +328,7 @@ pub fn transform_data(
                         annotation,
                         query_type,
                         query,
-                        &row,
+                        row,
                         &data.columns_pos,
                     )
                 })
@@ -339,14 +339,14 @@ pub fn transform_data(
 }
 
 /// Helper to get a list if unique granularities from normalized queries
-pub fn get_query_granularities(queries: &Vec<&NormalizedQuery>) -> Vec<String> {
+pub fn get_query_granularities(queries: &[&NormalizedQuery]) -> Vec<String> {
     queries
         .iter()
         .filter_map(|query| {
             query
                 .time_dimensions
                 .as_ref()
-                .and_then(|tds| tds.get(0))
+                .and_then(|tds| tds.first())
                 .and_then(|td| td.granularity.clone())
         })
         .collect::<HashSet<_>>()
@@ -361,7 +361,7 @@ pub fn get_pivot_query(
 ) -> Result<NormalizedQuery> {
     let mut pivot_query = queries
         .first()
-        .map(|q| *q)
+        .copied()
         .cloned()
         .ok_or_else(|| anyhow::anyhow!("Queries list cannot be empty"))?;
 
@@ -392,7 +392,7 @@ pub fn get_pivot_query(
                     dimension: "time".to_string(),
                     date_range: None,
                     compare_date_range: None,
-                    granularity: granularities.get(0).cloned(),
+                    granularity: granularities.first().cloned(),
                 }]);
             }
         }
@@ -427,7 +427,7 @@ pub fn get_final_cubestore_result(
         annotation,
         cube_store_result,
         query,
-        &query_type,
+        query_type,
         res_type.clone(),
     )?;
 
@@ -437,16 +437,16 @@ pub fn get_final_cubestore_result(
 }
 
 pub fn get_final_cubestore_result_multi(
-    request_data: &Vec<TransformDataRequest>,
-    cube_store_result: &Vec<&CubeStoreResult>,
+    request_data: &[TransformDataRequest],
+    cube_store_result: &[&CubeStoreResult],
     result_data: &mut RequestResultDataMulti,
 ) -> Result<()> {
     for (transform_data, cube_store_result, result) in multizip((
         request_data.iter(),
         cube_store_result.iter(),
         result_data.results.iter_mut(),
     )) {
-        get_final_cubestore_result(transform_data, *cube_store_result, result)?;
+        get_final_cubestore_result(transform_data, cube_store_result, result)?;
     }
 
     let normalized_queries = result_data

rust/cubeorchestrator/src/types.rs

@@ -35,9 +35,10 @@ pub enum ResultType {
     Compact,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
 pub enum QueryType {
     #[serde(rename = "regularQuery")]
+    #[default]
     RegularQuery,
     #[serde(rename = "compareDateRangeQuery")]
     CompareDateRangeQuery,
@@ -56,12 +57,6 @@ impl Display for QueryType {
     }
 }
 
-impl Default for QueryType {
-    fn default() -> Self {
-        QueryType::RegularQuery
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub enum MemberType {
     #[serde(rename = "measures")]