diff options
| author | Fuwn <[email protected]> | 2021-06-09 12:18:17 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2021-06-09 12:18:17 -0700 |
| commit | 9fbf1af0fac4b55cf4820322d4475f0a07371139 (patch) | |
| tree | d614b3880f650cb6aa90e4b38da03f47d693de9c /crates | |
| parent | feat(global): move whirl-generated files to their own directories (diff) | |
| download | whirl-9fbf1af0fac4b55cf4820322d4475f0a07371139.tar.xz whirl-9fbf1af0fac4b55cf4820322d4475f0a07371139.zip | |
refactor(config): rename `Whirl.toml` to `Config.toml`
Since the configuration file is in the `.whirl` directory, it is redundant to have it's name still
as `Whirl.toml`
BREAKING CHANGE: Configuration file is renamed
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/whirl_config/Config.default.toml (renamed from crates/whirl_config/Whirl.default.toml) | 0 | ||||
| -rw-r--r-- | crates/whirl_config/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/whirl_prompt/src/builtins/constants.rs | 2 | ||||
| -rw-r--r-- | crates/whirl_prompt/src/builtins/mod.rs | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/crates/whirl_config/Whirl.default.toml b/crates/whirl_config/Config.default.toml index aa2d684..aa2d684 100644 --- a/crates/whirl_config/Whirl.default.toml +++ b/crates/whirl_config/Config.default.toml diff --git a/crates/whirl_config/src/lib.rs b/crates/whirl_config/src/lib.rs index 47b26a8..93328ca 100644 --- a/crates/whirl_config/src/lib.rs +++ b/crates/whirl_config/src/lib.rs @@ -59,7 +59,7 @@ impl Config { fn load() -> Result<Self, ConfigError> { let mut s = config::Config::new(); - s.merge(File::with_name(".whirl/Whirl.toml").required(false))?; + s.merge(File::with_name(".whirl/Config.toml").required(false))?; s.try_into() } diff --git a/crates/whirl_prompt/src/builtins/constants.rs b/crates/whirl_prompt/src/builtins/constants.rs index e87cceb..8ba67bc 100644 --- a/crates/whirl_prompt/src/builtins/constants.rs +++ b/crates/whirl_prompt/src/builtins/constants.rs @@ -1,7 +1,7 @@ // Copyleft (ɔ) 2021-2021 The Whirlsplash Collective // SPDX-License-Identifier: GPL-3.0-only -pub const FILES: [&str; 2] = ["README.rst", "Whirl.toml"]; +pub const FILES: [&str; 2] = ["README.rst", "Config.toml"]; pub const HELPABLES_BUILTINS: [&str; 8] = [ "cat - display the contents of a present file", "config - manipulate the configuration", diff --git a/crates/whirl_prompt/src/builtins/mod.rs b/crates/whirl_prompt/src/builtins/mod.rs index 655f507..db9cb64 100644 --- a/crates/whirl_prompt/src/builtins/mod.rs +++ b/crates/whirl_prompt/src/builtins/mod.rs @@ -64,7 +64,7 @@ pub fn builtin_cat(args: &[String]) -> i32 { .unwrap(); transfer.perform().unwrap(); } - "Whirl.toml" => { + "Config.toml" => { colour::red_ln!("NOTE: This is just a wrapper for `config show`."); println!("{:#?}", Config::get()); } |