diff --git a/crates/nu-cli/src/data/config/conf.rs b/crates/nu-cli/src/data/config/conf.rs index 1f53f0c7a2..1805769339 100644 --- a/crates/nu-cli/src/data/config/conf.rs +++ b/crates/nu-cli/src/data/config/conf.rs @@ -4,7 +4,6 @@ use std::fmt::Debug; pub trait Conf: Debug + Send { fn env(&self) -> Option; fn path(&self) -> Option; - fn nu_env_dirs(&self) -> Option; fn reload(&self); } @@ -13,10 +12,6 @@ impl Conf for Box { (**self).env() } - fn nu_env_dirs(&self) -> Option { - (**self).nu_env_dirs() - } - fn path(&self) -> Option { (**self).path() } diff --git a/crates/nu-cli/src/data/config/nuconfig.rs b/crates/nu-cli/src/data/config/nuconfig.rs index 54001026a2..3444e1f7a9 100644 --- a/crates/nu-cli/src/data/config/nuconfig.rs +++ b/crates/nu-cli/src/data/config/nuconfig.rs @@ -20,10 +20,6 @@ impl Conf for NuConfig { self.path() } - fn nu_env_dirs(&self) -> Option { - self.nu_env_dirs() - } - fn reload(&self) { let mut vars = self.vars.lock(); @@ -56,14 +52,6 @@ impl NuConfig { None } - pub fn nu_env_dirs(&self) -> Option { - let vars = self.vars.lock(); - if let Some(dirs) = vars.get("nu_env_dirs") { - return Some(dirs.clone()); - } - None - } - pub fn path(&self) -> Option { let vars = self.vars.lock(); diff --git a/crates/nu-cli/src/data/config/tests.rs b/crates/nu-cli/src/data/config/tests.rs index ea8712fe0f..ecbe0cb7f7 100644 --- a/crates/nu-cli/src/data/config/tests.rs +++ b/crates/nu-cli/src/data/config/tests.rs @@ -16,10 +16,6 @@ impl Conf for FakeConfig { self.config.env() } - fn nu_env_dirs(&self) -> Option { - None - } - fn path(&self) -> Option { self.config.path() } diff --git a/crates/nu-cli/src/env/directory_specific_environment.rs b/crates/nu-cli/src/env/directory_specific_environment.rs index 587f56e553..d0323f7365 100644 --- a/crates/nu-cli/src/env/directory_specific_environment.rs +++ b/crates/nu-cli/src/env/directory_specific_environment.rs @@ -31,7 +31,7 @@ impl DirectorySpecificEnvironment { } } - fn toml_if_trusted(&self, mut wdirenv: PathBuf) -> std::io::Result { + fn toml_if_directory_is_trusted(&self, mut wdirenv: PathBuf) -> std::io::Result { if let Some(trusted) = &self.trusted { wdirenv.push(".nu-env"); if wdirenv.exists() { @@ -54,8 +54,8 @@ impl DirectorySpecificEnvironment { //Start in the current directory, then traverse towards the root with working_dir to see if we are in a subdirectory of a valid directory. while let Some(wdir) = working_dir { - if let Ok(toml_doc) = self.toml_if_trusted(wdir.to_path_buf()) { - toml_doc + if let Ok(toml_doc) = self.toml_if_directory_is_trusted(wdir.to_path_buf()) { + toml_doc .get("env") .ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section missing"))? .as_table()