open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config): improve signature of config loader

Browse Source
This commit is contained in:
Federico Terzi 2021-03-23 22:03:25 +01:00
parent 9098d5ac2a
commit 14196be5c5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
espanso-config/src/lib.rs
View File

@ -32,7 +32,7 @@ mod legacy;
pub mod matches; pub mod matches;
mod util; mod util;
pub fn load(base_path: &Path) -> Result<(impl ConfigStore, impl MatchStore)> { pub fn load(base_path: &Path) -> Result<(Box<dyn ConfigStore>, Box<dyn MatchStore>)> {
let config_dir = base_path.join("config"); let config_dir = base_path.join("config");
if !config_dir.exists() || !config_dir.is_dir() { if !config_dir.exists() || !config_dir.is_dir() {
return Err(ConfigError::MissingConfigDir().into()); return Err(ConfigError::MissingConfigDir().into());
@ -43,7 +43,11 @@ pub fn load(base_path: &Path) -> Result<(impl ConfigStore, impl MatchStore)> {
let match_store = matches::store::new(&root_paths.into_iter().collect::<Vec<String>>()); let match_store = matches::store::new(&root_paths.into_iter().collect::<Vec<String>>());
Ok((config_store, match_store)) Ok((Box::new(config_store), Box::new(match_store)))
}
pub fn load_legacy(config_dir: &Path, package_dir: &Path) -> Result<(Box<dyn ConfigStore>, Box<dyn MatchStore>)> {
legacy::load(config_dir, package_dir)
} }
pub fn is_legacy_config(base_dir: &Path) -> bool { pub fn is_legacy_config(base_dir: &Path) -> bool {
@ -60,7 +64,7 @@ pub enum ConfigError {
mod tests { mod tests {
use super::*; use super::*;
use crate::util::tests::use_test_directory; use crate::util::tests::use_test_directory;
use config::{AppProperties, ConfigStore}; use config::{AppProperties};
#[test] #[test]
fn load_works_correctly() { fn load_works_correctly() {