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

Fixes how environment is cloned inside tight loops (#678)

Browse Source 
* Improve cd IO error

* Fix environment cloning in loops

* Remove debug print

* Fmt
This commit is contained in:
Jakub Žádník
2022-01-06 00:21:26 +02:00
committed by GitHub
parent 14cd798f00
commit d0c280f6cc
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/nu-command/src/filesystem/cd.rs
View File

@ -34,11 +34,15 @@ impl Command for Cd {
let (path, span) = match path_val {
Some(v) => {
let path = v.as_path()?;
if !path.exists() {
return Err(ShellError::DirectoryNotFound(v.span()?));
}
let path = nu_path::canonicalize_with(path, &cwd)?;
let path = match nu_path::canonicalize_with(path, &cwd) {
Ok(p) => p,
Err(e) => {
return Err(ShellError::DirectoryNotFoundHelp(
v.span()?,
format!("IO Error: {:?}", e),
))
}
};
(path.to_string_lossy().to_string(), v.span()?)
}
None => {

3
crates/nu-command/src/filters/each.rs
View File

@ -82,8 +82,7 @@ impl Command for Each {
.into_iter()
.enumerate()
.map(move |(idx, x)| {
stack.env_vars = orig_env_vars.clone();
stack.env_hidden = orig_env_hidden.clone();
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {