extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-26 08:59:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error messages, remove last (?) unwrap

Browse Source
This commit is contained in:
Sam Hedin 2020-06-07 08:56:22 +02:00
parent c5b8abbcd3
commit aaacf4c336
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ impl DirectorySpecificEnvironment {
k.clone(), k.clone(),
v.to_str() v.to_str()
.ok_or_else(|| { .ok_or_else(|| {
Error::new(ErrorKind::Other, "Filepath is not valid unicode") Error::new(ErrorKind::Other, format!("{:?} is not valid unicode", v))
})? })?
.to_string(), .to_string(),
); );
@ -118,7 +118,17 @@ impl DirectorySpecificEnvironment {
let mut keys_in_current_nufile = vec![]; let mut keys_in_current_nufile = vec![];
for (k, v) in vars_in_current_file { for (k, v) in vars_in_current_file {
vars_to_add.insert(k.clone(), v.as_str().unwrap().to_string()); //This is used to add variables to the environment vars_to_add.insert(
k.clone(),
v.as_str()
.ok_or_else(|| {
Error::new(
ErrorKind::InvalidData,
format!("Could not read environment variable: {}", v),
)
})?
.to_string(),
); //This is used to add variables to the environment
keys_in_current_nufile.push(k.clone()); //this is used to keep track of which directory added which variables keys_in_current_nufile.push(k.clone()); //this is used to keep track of which directory added which variables
} }