extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-12 17:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename config function

Browse Source
This commit is contained in:
Sam Hedin 2020-06-06 13:26:42 +02:00
parent 2770a6f5e4
commit e4c951fe93
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-cli/src/data/config/conf.rs
View File

@ -4,7 +4,7 @@ use std::fmt::Debug;
pub trait Conf: Debug + Send { pub trait Conf: Debug + Send {
fn env(&self) -> Option<Value>; fn env(&self) -> Option<Value>;
fn path(&self) -> Option<Value>; fn path(&self) -> Option<Value>;
fn direnv_whitelist(&self) -> Option<Value>; fn nu_env_dirs(&self) -> Option<Value>;
fn reload(&self); fn reload(&self);
} }
@ -13,8 +13,8 @@ impl Conf for Box<dyn Conf> {
(**self).env() (**self).env()
} }
fn direnv_whitelist(&self) -> Option<Value> { fn nu_env_dirs(&self) -> Option<Value> {
(**self).direnv_whitelist() (**self).nu_env_dirs()
} }
fn path(&self) -> Option<Value> { fn path(&self) -> Option<Value> {

6
crates/nu-cli/src/data/config/nuconfig.rs
View File

@ -20,8 +20,8 @@ impl Conf for NuConfig {
self.path() self.path()
} }
fn direnv_whitelist(&self) -> Option<Value> { fn nu_env_dirs(&self) -> Option<Value> {
self.direnv_whitelist() self.nu_env_dirs()
} }
fn reload(&self) { fn reload(&self) {
@ -56,7 +56,7 @@ impl NuConfig {
None None
} }
pub fn direnv_whitelist(&self) -> Option<Value> { pub fn nu_env_dirs(&self) -> Option<Value> {
let vars = self.vars.lock(); let vars = self.vars.lock();
if let Some(dirs) = vars.get("nu_env_dirs") { if let Some(dirs) = vars.get("nu_env_dirs") {
return Some(dirs.clone()); return Some(dirs.clone());

2
crates/nu-cli/src/env/environment.rs vendored
View File

@ -54,7 +54,7 @@ impl Environment {
Environment { Environment {
environment_vars: env, environment_vars: env,
path_vars: path, path_vars: path,
direnv: DirectorySpecificEnvironment::new(configuration.direnv_whitelist()), direnv: DirectorySpecificEnvironment::new(configuration.nu_env_dirs()),
} }
} }