pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Chore): rustfmt

Browse source
This commit is contained in:
a-kenji 2021-03-26 21:59:38 +01:00
parent 98c4227c81
commit a80d5f700b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/input/config.rs
View file

@ -73,7 +73,7 @@ impl Config {
match Config::new(&config_path) { match Config::new(&config_path) {
Ok(config) => Ok(config), Ok(config) => Ok(config),
Err(ConfigError::IoPath(_,_)) => Ok(Config::default()), Err(ConfigError::IoPath(_, _)) => Ok(Config::default()),
Err(e) => Err(e), Err(e) => Err(e),
} }
} }
@ -82,7 +82,9 @@ impl Config {
pub fn from_cli_config(cli_config: Option<ConfigCli>) -> ConfigResult { pub fn from_cli_config(cli_config: Option<ConfigCli>) -> ConfigResult {
match cli_config { match cli_config {
Some(ConfigCli::Config { clean, .. }) if clean => Ok(Config::default()), Some(ConfigCli::Config { clean, .. }) if clean => Ok(Config::default()),
Some(ConfigCli::Config { path, .. }) if path.is_some()=> Ok(Config::new(&path.unwrap())?), Some(ConfigCli::Config { path, .. }) if path.is_some() => {
Ok(Config::new(&path.unwrap())?)
}
Some(_) | None => Ok(Config::from_default_path()?), Some(_) | None => Ok(Config::from_default_path()?),
} }
} }
@ -130,7 +132,10 @@ mod config_test {
#[test] #[test]
fn clean_option_equals_default_config() { fn clean_option_equals_default_config() {
let no_file = PathBuf::from(r"../fixtures/config/config.yamlll"); let no_file = PathBuf::from(r"../fixtures/config/config.yamlll");
let cli_config = ConfigCli::Config { path: Some(no_file) ,clean: true}; let cli_config = ConfigCli::Config {
path: Some(no_file),
clean: true,
};
let config = Config::from_cli_config(Some(cli_config)).unwrap(); let config = Config::from_cli_config(Some(cli_config)).unwrap();
let default = Config::default(); let default = Config::default();
assert_eq!(config, default); assert_eq!(config, default);