Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename whitelisted_directories to allowed_directories

Browse Source
This commit is contained in:
Sam Hedin 2020-06-08 06:16:44 +02:00
parent fe16db6a2f
commit 99824d864c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/nu-cli/src/env/directory_specific_environment.rs vendored
View File

@ -5,7 +5,7 @@ use std::{ffi::OsString, fmt::Debug, path::PathBuf};
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct DirectorySpecificEnvironment { pub struct DirectorySpecificEnvironment {
whitelisted_directories: Vec<PathBuf>, allowed_directories: Vec<PathBuf>,
//Directory -> Env key. If an environment var has been added from a .nu in a directory, we track it here so we can remove it when the user leaves the directory. //Directory -> Env key. If an environment var has been added from a .nu in a directory, we track it here so we can remove it when the user leaves the directory.
added_env_vars: IndexMap<PathBuf, Vec<String>>, added_env_vars: IndexMap<PathBuf, Vec<String>>,
@ -15,11 +15,11 @@ pub struct DirectorySpecificEnvironment {
} }
impl DirectorySpecificEnvironment { impl DirectorySpecificEnvironment {
pub fn new(whitelisted_directories: Option<Value>) -> DirectorySpecificEnvironment { pub fn new(allowed_directories: Option<Value>) -> DirectorySpecificEnvironment {
let mut whitelisted_directories = if let Some(Value { let mut allowed_directories = if let Some(Value {
value: UntaggedValue::Table(ref wrapped_directories), value: UntaggedValue::Table(ref wrapped_directories),
tag: _, tag: _,
}) = whitelisted_directories }) = allowed_directories
{ {
wrapped_directories wrapped_directories
.iter() .iter()
@ -37,10 +37,10 @@ impl DirectorySpecificEnvironment {
} else { } else {
vec![] vec![]
}; };
whitelisted_directories.sort(); allowed_directories.sort();
DirectorySpecificEnvironment { DirectorySpecificEnvironment {
whitelisted_directories, allowed_directories,
added_env_vars: IndexMap::new(), added_env_vars: IndexMap::new(),
overwritten_env_values: IndexMap::new(), overwritten_env_values: IndexMap::new(),
} }
@ -94,7 +94,7 @@ impl DirectorySpecificEnvironment {
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let mut vars_to_add = IndexMap::new(); let mut vars_to_add = IndexMap::new();
for dir in &self.whitelisted_directories { for dir in &self.allowed_directories {
let mut working_dir = Some(current_dir.as_path()); let mut working_dir = Some(current_dir.as_path());
//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. //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.