holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make env var eval order during "use" deterministic (#742)

Browse Source 
* Make env var eval order during "use" deterministic

Fixes #726.

* Merge delta after getting config

To make sure env vars are all in the engine state and not in the stack.
This commit is contained in:
Jakub Žádník
2022-01-14 23:06:32 +02:00
committed by GitHub
parent 7c23ae5cb0
commit 40484966c3
5 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/nu-parser/src/parse_keywords.rs
View File

@ -7,7 +7,7 @@ use nu_protocol::{
engine::StateWorkingSet,
span, Exportable, Overlay, PositionalArg, Span, SyntaxShape, Type, CONFIG_VARIABLE_ID,
};
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use crate::{
lex, lite_parse,
@ -1074,25 +1074,13 @@ pub fn parse_hide(
} else if import_pattern.members.is_empty() {
// The pattern head can be e.g. a function name, not just a module
if let Some(id) = working_set.find_decl(&import_pattern.head.name) {
let mut decls = HashMap::new();
decls.insert(import_pattern.head.name.clone(), id);
let mut overlay = Overlay::new();
overlay.add_decl(&import_pattern.head.name, id);
(
false,
Overlay {
decls,
env_vars: HashMap::new(),
},
)
(false, overlay)
} else {
// Or it could be an env var
(
false,
Overlay {
decls: HashMap::new(),
env_vars: HashMap::new(),
},
)
(false, Overlay::new())
}
} else {
return (