From 14e492e5ab3bd3b3fc35fca1d6f817d9f4db71f3 Mon Sep 17 00:00:00 2001 From: Morgante Pell Date: Wed, 14 Aug 2024 23:40:41 -0700 Subject: [PATCH] clippy time --- crates/cli/src/updater.rs | 4 +--- crates/core/src/foreign_function_definition.rs | 13 +++++++------ crates/core/src/marzano_resolved_pattern.rs | 8 +++----- crates/grit-pattern-matcher/src/pattern/not.rs | 5 ++++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/cli/src/updater.rs b/crates/cli/src/updater.rs index 3077a4657..777a19811 100644 --- a/crates/cli/src/updater.rs +++ b/crates/cli/src/updater.rs @@ -9,7 +9,7 @@ use log::info; use marzano_auth::info::AuthInfo; use marzano_gritmodule::config::REPO_CONFIG_DIR_NAME; use marzano_util::runtime::{ExecutionContext, LanguageModelAPI}; -use reqwest::redirect::Policy; + use serde::Deserialize; use serde::Serialize; use std::collections::HashMap; @@ -23,7 +23,6 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::sync::Mutex; use uuid::Uuid; -use crate::utils::{get_client_arch, get_client_os}; use marzano_auth::env::{get_env_auth, get_grit_api_url}; #[derive(Debug, Serialize, Deserialize, Clone)] @@ -641,7 +640,6 @@ fn release_details_relative_url(release: &str) -> String { #[cfg(test)] mod tests { - use fs_err::create_dir_all; use anyhow::Result; use chrono::NaiveDate; diff --git a/crates/core/src/foreign_function_definition.rs b/crates/core/src/foreign_function_definition.rs index a2f99da16..113b6a346 100644 --- a/crates/core/src/foreign_function_definition.rs +++ b/crates/core/src/foreign_function_definition.rs @@ -110,16 +110,17 @@ impl FunctionDefinition for ForeignFunctionDefinition { })?; #[cfg(feature = "external_functions")] - let result = function.call(&resolved_str).map_err(|e| GritPatternError::new(format!( - "failed to call function {}: {}", - self.name, e - )))?; + let result = function.call(&resolved_str).map_err(|e| { + GritPatternError::new(format!("failed to call function {}: {}", self.name, e)) + })?; // END embedded version - let string = String::from_utf8(result).map_err(|_| GritPatternError::new(format!( + let string = String::from_utf8(result).map_err(|_| { + GritPatternError::new(format!( "function {} returned did not return a UTF-8 string", self.name, - )))?; + )) + })?; Ok(FuncEvaluation { predicator: true, diff --git a/crates/core/src/marzano_resolved_pattern.rs b/crates/core/src/marzano_resolved_pattern.rs index fda9a077c..41ad66d03 100644 --- a/crates/core/src/marzano_resolved_pattern.rs +++ b/crates/core/src/marzano_resolved_pattern.rs @@ -696,11 +696,9 @@ impl<'a> ResolvedPattern<'a, MarzanoQueryContext> for MarzanoResolvedPattern<'a> ) .into()), // unsure if this is correct, taken from text - Self::Files(_files) => { - Err(GritPatternError::new( - "cannot linearize files pattern, not implemented yet", - )) - } + Self::Files(_files) => Err(GritPatternError::new( + "cannot linearize files pattern, not implemented yet", + )), // unsure if this is correct, taken from text Self::Constant(c) => Ok(c.to_string().into()), } diff --git a/crates/grit-pattern-matcher/src/pattern/not.rs b/crates/grit-pattern-matcher/src/pattern/not.rs index 03e7ce0cf..656651648 100644 --- a/crates/grit-pattern-matcher/src/pattern/not.rs +++ b/crates/grit-pattern-matcher/src/pattern/not.rs @@ -6,7 +6,10 @@ use super::{ }; use crate::context::QueryContext; use core::fmt::Debug; -use grit_util::{error::{GritPatternError, GritResult}, AnalysisLogs}; +use grit_util::{ + error::{GritPatternError, GritResult}, + AnalysisLogs, +}; #[derive(Debug, Clone)] pub struct Not {