changed insert to merge (nushell#399)

dedebenui · Benoît Sierro · web-flow · commit 2f142406d361 · 2023-03-08T06:42:58.000-06:00
updating the environment with closures should not
be done with `insert` because `insert` will call
a closure if it gets one as input, `merge` will not

Co-authored-by: Benoît Sierro &lt;benoit.sierro@bluewin.ch&gt;
diff --git a/virtual_environments/conda.nu b/virtual_environments/conda.nu
@@ -53,14 +53,15 @@ export def-env activate [
             {|| $'($virtual_prompt)' }
         }
 
-        $new_env
-        | insert CONDA_OLD_PROMPT_COMMAND $old_prompt_command
-        | insert PROMPT_COMMAND $new_prompt
+        $new_env | merge {
+            CONDA_OLD_PROMPT_COMMAND: $old_prompt_command
+            PROMPT_COMMAND: $new_prompt
+        }
     } else {
-        $new_env
-        | insert CONDA_OLD_PROMPT_COMMAND $nothing
+        $new_env | merge { CONDA_OLD_PROMPT_COMMAND: $nothing }
     }
 
+
     load-env $new_env
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,15 @@ export def-env activate [`
`53`	`53`	`{\|\| $'($virtual_prompt)' }`
`54`	`54`	`}`
`55`	`55`
`56`		`- $new_env`
`57`		`- \| insert CONDA_OLD_PROMPT_COMMAND $old_prompt_command`
`58`		`- \| insert PROMPT_COMMAND $new_prompt`
	`56`	`+ $new_env \| merge {`
	`57`	`+ CONDA_OLD_PROMPT_COMMAND: $old_prompt_command`
	`58`	`+ PROMPT_COMMAND: $new_prompt`
	`59`	`+ }`
`59`	`60`	`} else {`
`60`		`- $new_env`
`61`		`- \| insert CONDA_OLD_PROMPT_COMMAND $nothing`
	`61`	`+ $new_env \| merge { CONDA_OLD_PROMPT_COMMAND: $nothing }`
`62`	`62`	`}`
`63`	`63`
	`64`	`+`
`64`	`65`	`load-env $new_env`
`65`	`66`	`}`
`66`	`67`