aboutsummaryrefslogtreecommitdiff
path: root/base/src/lib.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-10-03 09:31:05 +0200
committermetamuffin <metamuffin@disroot.org>2023-10-03 09:31:05 +0200
commitfffc7a3b8a8a3ead3992d400ec9ed035f1f93b39 (patch)
tree44b7827eeda1ef5a0a9012873a78ba401f7027d1 /base/src/lib.rs
parent1fff4e3828ca0745aaed3d778dcd47f1dfa79cd3 (diff)
downloadjellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar
jellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar.bz2
jellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar.zst
use yaml for configuration
Diffstat (limited to 'base/src/lib.rs')
-rw-r--r--base/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/src/lib.rs b/base/src/lib.rs
index 062b028..132fd45 100644
--- a/base/src/lib.rs
+++ b/base/src/lib.rs
@@ -12,11 +12,11 @@ use jellycommon::{config::GlobalConfig, AssetLocation};
use std::{fs::File, path::PathBuf, sync::LazyLock};
pub static CONF: LazyLock<GlobalConfig> = LazyLock::new(|| {
- serde_json::from_reader(
+ serde_yaml::from_reader(
File::open(
std::env::args()
.nth(1)
- .expect("First argument must specify the config.json to use."),
+ .expect("First argument must specify the configuration to use."),
)
.unwrap(),
)