summaryrefslogtreecommitdiff
path: root/helix-loader/src/config.rs
diff options
context:
space:
mode:
Diffstat (limited to 'helix-loader/src/config.rs')
-rw-r--r--helix-loader/src/config.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs
index 259b1318..a4c6dcbd 100644
--- a/helix-loader/src/config.rs
+++ b/helix-loader/src/config.rs
@@ -1,6 +1,9 @@
+use std::str::from_utf8;
+
/// Default built-in languages.toml.
pub fn default_lang_config() -> toml::Value {
- toml::from_slice(include_bytes!("../../languages.toml"))
+ let default_config = include_bytes!("../../languages.toml");
+ toml::from_str(from_utf8(default_config).unwrap())
.expect("Could not parse built-in languages.toml to valid toml")
}
@@ -11,8 +14,8 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
.chain([crate::config_dir()].into_iter())
.map(|path| path.join("languages.toml"))
.filter_map(|file| {
- std::fs::read(&file)
- .map(|config| toml::from_slice(&config))
+ std::fs::read_to_string(&file)
+ .map(|config| toml::from_str(&config))
.ok()
})
.collect::<Result<Vec<_>, _>>()?