extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 07:05:47 +02:00
Code Issues 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

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

@ -47,11 +47,12 @@ impl Stack {
}
pub fn with_env(&mut self, env_vars: &[HashMap<String, Value>], env_hidden: &HashSet<String>) {
if env_vars.iter().any(|scope| !scope.is_empty()) {
// Do not clone the environment if it hasn't changed
if self.env_vars.iter().any(|scope| !scope.is_empty()) {
self.env_vars = env_vars.to_owned();
}
if !env_hidden.is_empty() {
if !self.env_hidden.is_empty() {
self.env_hidden = env_hidden.clone();
}
}

8
crates/nu-protocol/src/shell_error.rs
View File

@ -189,10 +189,14 @@ pub enum ShellError {
#[diagnostic(code(nu::shell::directory_not_found), url(docsrs))]
DirectoryNotFound(#[label("directory not found")] Span),
#[error("File not found")]
#[diagnostic(code(nu::shell::file_not_found), url(docsrs))]
#[error("Directory not found")]
#[diagnostic(code(nu::shell::directory_not_found_custom), url(docsrs))]
DirectoryNotFoundCustom(String, #[label("{0}")] Span),
#[error("Directory not found")]
#[diagnostic(code(nu::shell::directory_not_found_help), url(docsrs), help("{1}"))]
DirectoryNotFoundHelp(#[label("directory not found")] Span, String),
#[error("Move not possible")]
#[diagnostic(code(nu::shell::move_not_possible), url(docsrs))]
MoveNotPossible {