From 3d15ac076ceed1994329696700090d5d0d58ca75 Mon Sep 17 00:00:00 2001 From: Sam Hedin Date: Thu, 4 Jun 2020 01:13:04 +0200 Subject: [PATCH] Working dummy version --- crates/nu-cli/src/env/environment.rs | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/crates/nu-cli/src/env/environment.rs b/crates/nu-cli/src/env/environment.rs index d0286e1a7..08479477b 100644 --- a/crates/nu-cli/src/env/environment.rs +++ b/crates/nu-cli/src/env/environment.rs @@ -40,10 +40,24 @@ pub struct Environment { impl Environment { pub fn new() -> Environment { - Environment { + let mut e = Environment { environment_vars: None, path_vars: None, - } + }; + e.add_nurc(); + e + } + + pub fn from_config(configuration: &T) -> Environment { + let env = configuration.env(); + let path = configuration.path(); + + let mut e = Environment { + environment_vars: env, + path_vars: path, + }; + e.add_nurc(); + e } pub fn add_nurc(&mut self) { @@ -56,16 +70,6 @@ impl Environment { self.add_env(key, value); } - pub fn from_config(configuration: &T) -> Environment { - let env = configuration.env(); - let path = configuration.path(); - - Environment { - environment_vars: env, - path_vars: path, - } - } - pub fn morph(&mut self, configuration: &T) { self.environment_vars = configuration.env(); self.path_vars = configuration.path();