ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

config: wrap config errors in our own type

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-05-01 21:46:17 -07:00 committed by Martin von Zweigbergk
parent 8289e87423
commit 8b54ac58bd
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/config.rs
View file

@ -14,9 +14,16 @@
use std::env; use std::env;
use std::path::PathBuf; use std::path::PathBuf;
use thiserror::Error;
use jujutsu_lib::settings::UserSettings; use jujutsu_lib::settings::UserSettings;
#[derive(Error, Debug)]
pub enum ConfigError {
#[error(transparent)]
ConfigReadError(#[from] config::ConfigError),
}
fn config_path() -> Option<PathBuf> { fn config_path() -> Option<PathBuf> {
if let Ok(config_path) = env::var("JJ_CONFIG") { if let Ok(config_path) = env::var("JJ_CONFIG") {
// TODO: We should probably support colon-separated (std::env::split_paths) // TODO: We should probably support colon-separated (std::env::split_paths)
@ -56,7 +63,7 @@ fn env_overrides() -> config::Config {
builder.build().unwrap() builder.build().unwrap()
} }
pub fn read_config() -> Result<UserSettings, config::ConfigError> { pub fn read_config() -> Result<UserSettings, ConfigError> {
let mut config_builder = config::Config::builder().add_source(env_base()); let mut config_builder = config::Config::builder().add_source(env_base());
if let Some(config_path) = config_path() { if let Some(config_path) = config_path() {