strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

refactor: use latest libcorn with serde support

Browse Source 
This should speed Corn config loading up a bit :)
This commit is contained in:
Jake Stanger
2022-11-28 22:23:11 +00:00
parent cf87bb4e8d
commit 0fb5fa8c2a
3 changed files with 153 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/config.rs
View File

@@ -175,14 +175,7 @@ impl Config {
"json" => serde_json::from_slice(&file).wrap_err("Invalid JSON config"),
"toml" => toml::from_slice(&file).wrap_err("Invalid TOML config"),
"yaml" | "yml" => serde_yaml::from_slice(&file).wrap_err("Invalid YAML config"),
"corn" => {
// corn doesn't support deserialization yet
// so serialize the interpreted result then deserialize that
let file =
String::from_utf8(file).wrap_err("Config file contains invalid UTF-8")?;
let config = libcorn::parse(&file).wrap_err("Invalid corn config")?.value;
Ok(serde_json::from_str(&serde_json::to_string(&config)?)?)
}
"corn" => libcorn::from_slice(&file).wrap_err("Invalid Corn config"),
_ => unreachable!(),
}
}