extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-23 23:00:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clippy

Browse Source
This commit is contained in:
Sam Hedin 2020-06-07 06:55:38 +02:00
parent e4c951fe93
commit ff742ed675
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-cli/src/data/config/tests.rs
View File

@ -16,6 +16,10 @@ impl Conf for FakeConfig {
self.config.env()
}
fn nu_env_dirs(&self) -> Option<Value> {
None
}
fn path(&self) -> Option<Value> {
self.config.path()
}

23
crates/nu-cli/src/env/directory_specific_environment.rs vendored
View File

@ -60,12 +60,17 @@ impl DirectorySpecificEnvironment {
new_overwritten.insert(directory.clone(), keyvals.clone());
break;
} else {
working_dir = working_dir.unwrap().parent();
working_dir = working_dir.expect("Root directory has no parent").parent();
}
}
if re_add_keyvals {
for (k, v) in keyvals {
keyvals_to_restore.insert(k.clone(), v.to_str().unwrap().to_string());
keyvals_to_restore.insert(
k.clone(),
v.to_str()
.expect("Filepath is not valid unicode")
.to_string(),
);
}
}
}
@ -86,9 +91,13 @@ impl DirectorySpecificEnvironment {
if wdir == dir.as_path() {
//Read the .nu file and parse it into a nice map
let toml_doc = std::fs::read_to_string(wdir.join(".nu").as_path())?
.parse::<toml::Value>()
.unwrap();
let vars_in_current_file = toml_doc.get("env").unwrap().as_table().unwrap();
.parse::<toml::Value>()?;
let vars_in_current_file = toml_doc
.get("env")
.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidData, "No [env] section in .nu-file"))?
.as_table()
.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidData, "Malformed [env] section in .nu-file"))?;
let mut keys_in_current_nufile = vec![];
for (k, v) in vars_in_current_file {
@ -113,7 +122,7 @@ impl DirectorySpecificEnvironment {
.insert(wdir.to_path_buf(), keys_in_current_nufile);
break;
} else {
working_dir = working_dir.unwrap().parent();
working_dir = working_dir.expect("Root directory has no parent").parent();
}
}
}
@ -136,7 +145,7 @@ impl DirectorySpecificEnvironment {
if &wdir == directory {
return vars_to_delete;
} else {
working_dir = working_dir.unwrap().parent();
working_dir = working_dir.expect("Root directory has no parent").parent();
}
}
//only delete vars from directories we are not in

4
crates/nu-cli/src/env/environment.rs vendored
View File

@ -238,7 +238,7 @@ mod tests {
let fake_config = FakeConfig::new(&file);
let mut actual = Environment::from_config(&fake_config);
actual.add_env("USER", "NUNO");
actual.add_env("USER", "NUNO", false);
assert_eq!(
actual.env(),
@ -271,7 +271,7 @@ mod tests {
let fake_config = FakeConfig::new(&file);
let mut actual = Environment::from_config(&fake_config);
actual.add_env("SHELL", "/usr/bin/sh");
actual.add_env("SHELL", "/usr/bin/sh", false);
assert_eq!(
actual.env(),