extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 07:16:05 +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-protocol/src/engine/engine_state.rs
View File

@ -935,14 +935,14 @@ impl EngineState {
let pwd = if let Some(stack) = stack {
stack.get_env_var(self, "PWD")
} else {
self.get_env_var("PWD").cloned()
self.get_env_var("PWD")
};
let pwd = pwd.ok_or_else(|| error("$env.PWD not found", ""))?;
if let Value::String { val, .. } = pwd {
let path = AbsolutePathBuf::try_from(val)
.map_err(|path| error("$env.PWD is not an absolute path", path))?;
if let Ok(pwd) = pwd.as_str() {
let path = AbsolutePathBuf::try_from(pwd)
.map_err(|_| error("$env.PWD is not an absolute path", pwd))?;
// Technically, a root path counts as "having trailing slashes", but
// for the purpose of PWD, a root path is acceptable.

16
crates/nu-protocol/src/engine/stack.rs
View File

@ -211,7 +211,7 @@ impl Stack {
///
/// The config will be updated with successfully parsed values even if an error occurs.
pub fn update_config(&mut self, engine_state: &EngineState) -> Result<(), ShellError> {
if let Some(mut config) = self.get_env_var(engine_state, "config") {
if let Some(mut config) = self.get_env_var(engine_state, "config").cloned() {
let existing_config = self.get_config(engine_state);
let (new_config, error) = config.parse_as_config(&existing_config);
self.config = Some(new_config.into());
@ -451,12 +451,16 @@ impl Stack {
result
}
pub fn get_env_var(&self, engine_state: &EngineState, name: &str) -> Option<Value> {
pub fn get_env_var<'a>(
&'a self,
engine_state: &'a EngineState,
name: &str,
) -> Option<&'a Value> {
for scope in self.env_vars.iter().rev() {
for active_overlay in self.active_overlays.iter().rev() {
if let Some(env_vars) = scope.get(active_overlay) {
if let Some(v) = env_vars.get(name) {
return Some(v.clone());
return Some(v);
}
}
}
@ -472,7 +476,7 @@ impl Stack {
if !is_hidden {
if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
if let Some(v) = env_vars.get(name) {
return Some(v.clone());
return Some(v);
}
}
}
@ -842,7 +846,9 @@ mod test {
);
assert_eq!(
original.get_env_var(&engine_state, "ADDED_IN_CHILD"),
original
.get_env_var(&engine_state, "ADDED_IN_CHILD")
.cloned(),
Some(string_value("New Env Var")),
);
}