summaryrefslogtreecommitdiffstats
path: root/src/configs
diff options
context:
space:
mode:
authorfilip <filipbachul@gmail.com>2021-07-14 00:06:08 +0300
committerGitHub <noreply@github.com>2021-07-13 17:06:08 -0400
commit88ed0ed45a2f4dfe57085324f93fe0f1f65c7184 (patch)
treeb92e6ee682d6b6613e1ca2d463a49f046d34534d /src/configs
parentc9249dbe0b8e508b0067512e1accdf80e4d014ec (diff)
feat(env_var): allow multiple instances (#2797)
Allows displaying multiple instances of the env_var module.
Diffstat (limited to 'src/configs')
-rw-r--r--src/configs/mod.rs2
-rw-r--r--src/configs/starship_root.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/configs/mod.rs b/src/configs/mod.rs
index 658c4553b..f5867dfe4 100644
--- a/src/configs/mod.rs
+++ b/src/configs/mod.rs
@@ -91,7 +91,7 @@ pub struct FullConfig<'a> {
dotnet: dotnet::DotnetConfig<'a>,
elixir: elixir::ElixirConfig<'a>,
elm: elm::ElmConfig<'a>,
- env_var: env_var::EnvVarConfig<'a>,
+ env_var: IndexMap<String, env_var::EnvVarConfig<'a>>,
erlang: erlang::ErlangConfig<'a>,
gcloud: gcloud::GcloudConfig<'a>,
git_branch: git_branch::GitBranchConfig<'a>,
diff --git a/src/configs/starship_root.rs b/src/configs/starship_root.rs
index 7d5bfcdab..d6dc4617b 100644
--- a/src/configs/starship_root.rs
+++ b/src/configs/starship_root.rs
@@ -105,7 +105,10 @@ impl<'a> ModuleConfig<'a> for StarshipRootConfig<'a> {
"command_timeout" => self.command_timeout.load_config(v),
"add_newline" => self.add_newline.load_config(v),
unknown => {
- if !ALL_MODULES.contains(&unknown) && unknown != "custom" {
+ if !ALL_MODULES.contains(&unknown)
+ && unknown != "custom"
+ && unknown != "env_var"
+ {
log::warn!("Unknown config key '{}'", unknown);
let did_you_mean = &[
@@ -116,6 +119,7 @@ impl<'a> ModuleConfig<'a> for StarshipRootConfig<'a> {
"add_newline",
// Modules
"custom",
+ "env_var",
]
.iter()
.chain(ALL_MODULES.iter())