From 42d4351f4b71b666e7fd5249b53b23a35b7a97ad Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Tue, 5 Oct 2021 22:05:53 +0200 Subject: [PATCH] fix(config): fix warnings --- espanso-config/src/config/resolve.rs | 2 +- espanso-config/src/config/store.rs | 13 +++-- espanso-config/src/legacy/config.rs | 54 +++++++++---------- espanso-config/src/legacy/mod.rs | 8 +-- espanso-config/src/legacy/model.rs | 1 + espanso-config/src/lib.rs | 11 ++-- .../src/matches/group/loader/yaml/mod.rs | 8 ++- espanso-config/src/matches/mod.rs | 10 ++-- espanso-config/src/matches/store/default.rs | 2 +- espanso-config/src/util.rs | 8 +-- 10 files changed, 53 insertions(+), 64 deletions(-) diff --git a/espanso-config/src/config/resolve.rs b/espanso-config/src/config/resolve.rs index 9a81380..f0875e9 100644 --- a/espanso-config/src/config/resolve.rs +++ b/espanso-config/src/config/resolve.rs @@ -240,7 +240,7 @@ impl Config for ResolvedConfig { } fn word_separators(&self) -> Vec { - self.parsed.word_separators.clone().unwrap_or(vec![ + self.parsed.word_separators.clone().unwrap_or_else(|| vec![ " ".to_string(), ",".to_string(), ".".to_string(), diff --git a/espanso-config/src/config/store.rs b/espanso-config/src/config/store.rs index bd6d78f..e4e6715 100644 --- a/espanso-config/src/config/store.rs +++ b/espanso-config/src/config/store.rs @@ -22,8 +22,8 @@ use crate::error::NonFatalErrorSet; use super::{resolve::ResolvedConfig, Config, ConfigStore, ConfigStoreError}; use anyhow::{Context, Result}; use log::{debug, error}; -use std::{collections::HashSet, path::Path}; use std::sync::Arc; +use std::{collections::HashSet, path::Path}; pub(crate) struct DefaultConfigStore { default: Arc, @@ -39,18 +39,17 @@ impl ConfigStore for DefaultConfigStore { // Find a custom config that matches or fallback to the default one for custom in self.customs.iter() { if custom.is_match(app) { - return Arc::clone(&custom); + return Arc::clone(custom); } } Arc::clone(&self.default) } fn configs(&self) -> Vec> { - let mut configs = Vec::new(); + let mut configs = vec![Arc::clone(&self.default)]; - configs.push(Arc::clone(&self.default)); for custom in self.customs.iter() { - configs.push(Arc::clone(&custom)); + configs.push(Arc::clone(custom)); } configs @@ -83,8 +82,8 @@ impl DefaultConfigStore { let mut non_fatal_errors = Vec::new(); - let default = - ResolvedConfig::load(&default_file, None).context("failed to load default.yml configuration")?; + let default = ResolvedConfig::load(&default_file, None) + .context("failed to load default.yml configuration")?; debug!("loaded default config at path: {:?}", default_file); // Then the others diff --git a/espanso-config/src/legacy/config.rs b/espanso-config/src/legacy/config.rs index 1612282..c3340b8 100644 --- a/espanso-config/src/legacy/config.rs +++ b/espanso-config/src/legacy/config.rs @@ -560,8 +560,7 @@ impl LegacyConfigSet { let mut name_set = HashSet::new(); let mut children_map: HashMap> = HashMap::new(); let mut package_map: HashMap> = HashMap::new(); - let mut root_configs = Vec::new(); - root_configs.push(default); + let mut root_configs = vec![default]; let mut file_loader = |entry: walkdir::Result, dest_map: &mut HashMap>| @@ -592,7 +591,7 @@ impl LegacyConfigSet { return Ok(()); } - let mut config = LegacyConfig::load_config(&path)?; + let mut config = LegacyConfig::load_config(path)?; // Make sure the config does not contain reserved fields if !config.validate_user_defined_config() { @@ -811,7 +810,7 @@ mod tests { #[test] fn test_config_file_not_found() { let config = LegacyConfig::load_config(Path::new("invalid/path")); - assert_eq!(config.is_err(), true); + assert!(config.is_err()); assert_eq!(config.unwrap_err(), ConfigLoadError::FileNotFound); } @@ -833,13 +832,13 @@ mod tests { let mut result = true; validate_field!(result, 3, 3); - assert_eq!(result, true); + assert!(result); validate_field!(result, 10, 3); - assert_eq!(result, false); + assert!(!result); validate_field!(result, 3, 3); - assert_eq!(result, false); + assert!(!result); } #[test] @@ -852,7 +851,7 @@ mod tests { "###, ); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.unwrap().validate_user_defined_config(), true); + assert!(config.unwrap().validate_user_defined_config()); } #[test] @@ -866,7 +865,7 @@ mod tests { "###, ); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.unwrap().validate_user_defined_config(), false); + assert!(!config.unwrap().validate_user_defined_config()); } #[test] @@ -880,7 +879,7 @@ mod tests { "###, ); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.unwrap().validate_user_defined_config(), false); + assert!(!config.unwrap().validate_user_defined_config()); } #[test] @@ -894,7 +893,7 @@ mod tests { "###, ); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.unwrap().validate_user_defined_config(), false); + assert!(!config.unwrap().validate_user_defined_config()); } #[test] @@ -908,14 +907,14 @@ mod tests { "###, ); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.unwrap().validate_user_defined_config(), false); + assert!(!config.unwrap().validate_user_defined_config()); } #[test] fn test_config_loaded_correctly() { let working_config_file = create_tmp_file(TEST_WORKING_CONFIG_FILE); let config = LegacyConfig::load_config(working_config_file.path()); - assert_eq!(config.is_ok(), true); + assert!(config.is_ok()); } // Test ConfigSet @@ -936,7 +935,7 @@ mod tests { (data_dir, package_dir) } - pub fn create_temp_file_in_dir(tmp_dir: &PathBuf, name: &str, content: &str) -> PathBuf { + pub fn create_temp_file_in_dir(tmp_dir: &Path, name: &str, content: &str) -> PathBuf { let user_defined_path = tmp_dir.join(name); let user_defined_path_copy = user_defined_path.clone(); fs::write(user_defined_path, content).unwrap(); @@ -979,7 +978,7 @@ mod tests { fn test_config_set_load_fail_bad_directory() { let config_set = LegacyConfigSet::load(Path::new("invalid/path"), Path::new("invalid/path")); - assert_eq!(config_set.is_err(), true); + assert!(config_set.is_err()); assert_eq!( config_set.unwrap_err(), ConfigLoadError::InvalidConfigDirectory @@ -992,7 +991,7 @@ mod tests { let package_dir = TempDir::new().expect("unable to create package directory"); let config_set = LegacyConfigSet::load(data_dir.path(), package_dir.path()); - assert_eq!(config_set.is_err(), true); + assert!(config_set.is_err()); assert_eq!(config_set.unwrap_err(), ConfigLoadError::FileNotFound); } @@ -1607,9 +1606,8 @@ mod tests { #[test] fn test_list_has_conflict_no_conflict() { - assert_eq!( - LegacyConfigSet::list_has_conflicts(&[":ab".to_owned(), ":bc".to_owned()]), - false + assert!( + !LegacyConfigSet::list_has_conflicts(&[":ab".to_owned(), ":bc".to_owned()]) ); } @@ -1617,7 +1615,7 @@ mod tests { fn test_list_has_conflict_conflict() { let mut list = vec!["ac".to_owned(), "ab".to_owned(), "abc".to_owned()]; list.sort(); - assert_eq!(LegacyConfigSet::list_has_conflicts(&list), true); + assert!(LegacyConfigSet::list_has_conflicts(&list)); } #[test] @@ -1645,9 +1643,8 @@ mod tests { ); let config_set = LegacyConfigSet::load(data_dir.path(), package_dir.path()).unwrap(); - assert_eq!( - LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), - false + assert!( + !LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), ); } @@ -1678,9 +1675,8 @@ mod tests { ); let config_set = LegacyConfigSet::load(data_dir.path(), package_dir.path()).unwrap(); - assert_eq!( + assert!( LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), - true ); } @@ -1709,9 +1705,8 @@ mod tests { ); let config_set = LegacyConfigSet::load(data_dir.path(), package_dir.path()).unwrap(); - assert_eq!( + assert!( LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), - true ); } @@ -1751,9 +1746,8 @@ mod tests { ); let config_set = LegacyConfigSet::load(data_dir.path(), package_dir.path()).unwrap(); - assert_eq!( - LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), - false + assert!( + !LegacyConfigSet::has_conflicts(&config_set.default, &config_set.specific), ); } diff --git a/espanso-config/src/legacy/mod.rs b/espanso-config/src/legacy/mod.rs index 9fcc2bf..005d8dc 100644 --- a/espanso-config/src/legacy/mod.rs +++ b/espanso-config/src/legacy/mod.rs @@ -414,11 +414,7 @@ impl LegacyMatchStore { impl MatchStore for LegacyMatchStore { fn query(&self, paths: &[String]) -> MatchSet { let group = if !paths.is_empty() { - if let Some(group) = self.groups.get(&paths[0]) { - Some(group) - } else { - None - } + self.groups.get(&paths[0]) } else { None }; @@ -437,7 +433,7 @@ impl MatchStore for LegacyMatchStore { } fn loaded_paths(&self) -> Vec { - self.groups.keys().map(|key| key.clone()).collect() + self.groups.keys().cloned().collect() } } diff --git a/espanso-config/src/legacy/model.rs b/espanso-config/src/legacy/model.rs index f95ed31..4427deb 100644 --- a/espanso-config/src/legacy/model.rs +++ b/espanso-config/src/legacy/model.rs @@ -20,6 +20,7 @@ use serde::{Deserialize, Serialize}; #[allow(non_camel_case_types)] +#[allow(clippy::upper_case_acronyms)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub enum KeyModifier { CTRL, diff --git a/espanso-config/src/lib.rs b/espanso-config/src/lib.rs index 2293fe8..5442a42 100644 --- a/espanso-config/src/lib.rs +++ b/espanso-config/src/lib.rs @@ -33,6 +33,7 @@ mod legacy; pub mod matches; mod util; +#[allow(clippy::type_complexity)] pub fn load(base_path: &Path) -> Result<(Box, Box, Vec)> { let config_dir = base_path.join("config"); if !config_dir.exists() || !config_dir.is_dir() { @@ -125,7 +126,7 @@ mod tests { ) .unwrap(); - let (config_store, match_store, errors) = load(&base).unwrap(); + let (config_store, match_store, errors) = load(base).unwrap(); assert_eq!(errors.len(), 0); assert_eq!(config_store.default().match_paths().len(), 2); @@ -220,7 +221,7 @@ mod tests { ) .unwrap(); - let (config_store, match_store, errors) = load(&base).unwrap(); + let (config_store, match_store, errors) = load(base).unwrap(); assert_eq!(errors.len(), 3); // It shouldn't have loaded the "config.yml" one because of the YAML error @@ -248,7 +249,7 @@ mod tests { let config_file = config_dir.join("default.yml"); std::fs::write(&config_file, r#""#).unwrap(); - let (config_store, match_store, errors) = load(&base).unwrap(); + let (config_store, match_store, errors) = load(base).unwrap(); assert_eq!(errors.len(), 1); assert_eq!(errors[0].file, base_file); @@ -286,7 +287,7 @@ mod tests { "#).unwrap(); // A syntax error in the default.yml file cannot be handled gracefully - assert!(load(&base).is_err()); + assert!(load(base).is_err()); }); } @@ -294,7 +295,7 @@ mod tests { fn load_without_valid_config_dir() { use_test_directory(|_, match_dir, _| { // To correcly load the configs, the "load" method looks for the "config" directory - assert!(load(&match_dir).is_err()); + assert!(load(match_dir).is_err()); }); } } diff --git a/espanso-config/src/matches/group/loader/yaml/mod.rs b/espanso-config/src/matches/group/loader/yaml/mod.rs index 936fecf..1d3a61c 100644 --- a/espanso-config/src/matches/group/loader/yaml/mod.rs +++ b/espanso-config/src/matches/group/loader/yaml/mod.rs @@ -111,8 +111,8 @@ impl Importer for YAMLImporter { Ok(( MatchGroup { imports: resolved_imports, - global_vars: global_vars, - matches: matches, + global_vars, + matches, }, non_fatal_error_set, )) @@ -130,10 +130,8 @@ pub fn try_convert_into_match(yaml_match: YAMLMatch) -> Result<(Match, Vec(&'a self) -> &'a str { + pub fn description(&self) -> &str { if let Some(label) = &self.label { - &label + label } else if let MatchEffect::Text(text_effect) = &self.effect { &text_effect.replace } else if let MatchEffect::Image(_) = &self.effect { @@ -63,7 +63,7 @@ impl Match { } // TODO: test - pub fn cause_description<'a>(&'a self) -> Option<&'a str> { + pub fn cause_description(&self) -> Option<&str> { self.cause.description() } } @@ -80,7 +80,7 @@ pub enum MatchCause { impl MatchCause { // TODO: test - pub fn description<'a>(&'a self) -> Option<&'a str> { + pub fn description(&self) -> Option<&str> { if let MatchCause::Trigger(trigger_cause) = &self { trigger_cause.triggers.first().map(|s| s.as_str()) } else { @@ -91,7 +91,7 @@ impl MatchCause { } // TODO: test - pub fn long_description<'a>(&'a self) -> String { + pub fn long_description(&self) -> String { if let MatchCause::Trigger(trigger_cause) = &self { format!("triggers: {:?}", trigger_cause.triggers) } else { diff --git a/espanso-config/src/matches/store/default.rs b/espanso-config/src/matches/store/default.rs index 2c346d5..241074d 100644 --- a/espanso-config/src/matches/store/default.rs +++ b/espanso-config/src/matches/store/default.rs @@ -72,7 +72,7 @@ impl MatchStore for DefaultMatchStore { } fn loaded_paths(&self) -> Vec { - self.groups.keys().map(|key| key.clone()).collect() + self.groups.keys().cloned().collect() } } diff --git a/espanso-config/src/util.rs b/espanso-config/src/util.rs index 2335274..266d4a3 100644 --- a/espanso-config/src/util.rs +++ b/espanso-config/src/util.rs @@ -54,21 +54,21 @@ pub mod tests { #[test] fn is_yaml_empty_document_empty() { - assert_eq!(is_yaml_empty(""), true); + assert!(is_yaml_empty("")); } #[test] fn is_yaml_empty_document_with_comments() { - assert_eq!(is_yaml_empty("\n#comment \n \n"), true); + assert!(is_yaml_empty("\n#comment \n \n")); } #[test] fn is_yaml_empty_document_with_comments_and_content() { - assert_eq!(is_yaml_empty("\n#comment \n field: true\n"), false); + assert!(!is_yaml_empty("\n#comment \n field: true\n")); } #[test] fn is_yaml_empty_document_with_content() { - assert_eq!(is_yaml_empty("\nfield: true\n"), false); + assert!(!is_yaml_empty("\nfield: true\n")); } }