extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 00:44:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make get_env_var return a reference to a Value (#13987)

Browse Source 
# Description
Title says it all, changes `EngineState::get_env_var` to return a
`Option<&'a Value>` instead of an owned `Option<Value>`. This avoids
some unnecessary clones.

I also made a similar change to the `PluginExecutionContext` trait.
This commit is contained in:
Ian Manske
2024-10-02 04:05:48 -07:00
committed by GitHub
parent f03ba6793e
commit 157494e803
17 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-engine/src/env.rs
View File

@ -240,7 +240,7 @@ pub fn path_str(
}
}?;
env_to_string(pathname, &pathval, engine_state, stack)
env_to_string(pathname, pathval, engine_state, stack)
}
pub const DIR_VAR_PARSER_INFO: &str = "dirs_var";
@ -274,7 +274,7 @@ pub fn find_in_dirs_env(
) -> Result<Option<PathBuf>, ShellError> {
// Choose whether to use file-relative or PWD-relative path
let cwd = if let Some(pwd) = stack.get_env_var(engine_state, "FILE_PWD") {
match env_to_string("FILE_PWD", &pwd, engine_state, stack) {
match env_to_string("FILE_PWD", pwd, engine_state, stack) {
Ok(cwd) => {
if Path::new(&cwd).is_absolute() {
cwd
@ -294,7 +294,7 @@ pub fn find_in_dirs_env(
engine_state.cwd_as_string(Some(stack))?
};
let check_dir = |lib_dirs: Option<Value>| -> Option<PathBuf> {
let check_dir = |lib_dirs: Option<&Value>| -> Option<PathBuf> {
if let Ok(p) = canonicalize_with(filename, &cwd) {
return Some(p);
}
@ -316,7 +316,7 @@ pub fn find_in_dirs_env(
.flatten()
};
let lib_dirs = dirs_var.and_then(|var_id| engine_state.get_var(var_id).const_val.clone());
let lib_dirs = dirs_var.and_then(|var_id| engine_state.get_var(var_id).const_val.as_ref());
// TODO: remove (see #8310)
let lib_dirs_fallback = stack.get_env_var(engine_state, "NU_LIB_DIRS");