Skip to content
This repository has been archived by the owner on Jun 8, 2024. It is now read-only.

Commit

Permalink
chore(global config): merged related consts
Browse files Browse the repository at this point in the history
Merged `CONFY_APP_NAME` and `GLOBAL_CONFIG_BASE_NAME` into `APP_NAME`.
It is shorter and more meaningful.
  • Loading branch information
Andrew15-5 committed Oct 30, 2023
1 parent 237ac18 commit cd115c6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use typstfmt_lib::{format, Config};

const VERSION: &str = env!("TYPSTFMT_VERSION");
const CONFIG_FILE_NAME: &str = "typstfmt.toml";
const CONFY_APP_NAME: &str = "typstfmt";
const GLOBAL_CONFIG_BASE_NAME: &str = "typstfmt";
/// Note: used in [`confy`](https://crates.io/crates/confy) functions.
const APP_NAME: &str = "typstfmt";
const HELP: &str = r#"Format Typst code
usage: typstfmt [options] [file...]
Expand Down Expand Up @@ -157,7 +157,7 @@ fn main() -> Result<(), lexopt::Error> {
}
Long("get-global-config-path") => {
let config_path =
confy::get_configuration_file_path(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME)
confy::get_configuration_file_path(APP_NAME, APP_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
println!("{}", config_path.display());
return Ok(());
Expand Down Expand Up @@ -224,9 +224,9 @@ fn main() -> Result<(), lexopt::Error> {
Config::from_toml(&buf).unwrap_or_else(|e| panic!("Config file invalid: {e}.\nYou'll maybe have to delete it and use -C to create a default config file."))
} else {
let config_path =
confy::get_configuration_file_path(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME)
confy::get_configuration_file_path(APP_NAME, APP_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
confy::load(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME).unwrap_or_else(|e| {
confy::load(APP_NAME, APP_NAME).unwrap_or_else(|e| {
panic!(
"Error loading global configuration file at {}: {e}",
config_path.display()
Expand Down

0 comments on commit cd115c6

Please sign in to comment.