Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify a thing

Browse Source
This commit is contained in:
galister
2024-03-06 19:03:40 +01:00
parent a55ade6741
commit 85d9ea9127
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.rs
View File

@@ -165,9 +165,8 @@ where
let file_name = FILES[config_type as usize]; let file_name = FILES[config_type as usize];
let maybe_override = config_io::load(file_name); let maybe_override = config_io::load(file_name);
for yaml in [maybe_override.as_deref(), Some(fallback)].iter() { for yaml in [maybe_override.as_deref(), Some(fallback)].iter().flatten() {
if let Some(yaml_data) = yaml { match serde_yaml::from_str::<T>(yaml) {
match serde_yaml::from_str::<T>(yaml_data) {
Ok(d) => return d, Ok(d) => return d,
Err(e) => { Err(e) => {
error!("Failed to parse {}, falling back to defaults.", file_name); error!("Failed to parse {}, falling back to defaults.", file_name);
@@ -175,7 +174,6 @@ where
} }
} }
} }
}
// can only get here if internal fallback is broken // can only get here if internal fallback is broken
panic!("No usable config found."); panic!("No usable config found.");
} }