extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-29 22:29:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clippy... again

Browse Source
This commit is contained in:
Sam Hedin 2020-06-25 16:32:01 +02:00
parent a631040875
commit b9c170d359
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/nu-cli/src/commands/autoenv_trust.rs
View File

@ -61,9 +61,12 @@ impl WholeStreamCommand for AutoenvTrust {
.insert(file_to_trust, hasher.finish().to_string()); .insert(file_to_trust, hasher.finish().to_string());
let config_path = config::default_path_for(&Some(PathBuf::from("nu-env.toml")))?; let config_path = config::default_path_for(&Some(PathBuf::from("nu-env.toml")))?;
let tomlstr = toml::to_string(&allowed).or_else(|_| Err(ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")))?; let tomlstr = toml::to_string(&allowed).or_else(|_| {
fs::write(config_path, tomlstr) Err(ShellError::untagged_runtime_error(
.expect("Couldn't write to toml file"); "Couldn't serialize allowed dirs to nu-env.toml",
))
})?;
fs::write(config_path, tomlstr).expect("Couldn't write to toml file");
Ok(OutputStream::one(ReturnSuccess::value( Ok(OutputStream::one(ReturnSuccess::value(
UntaggedValue::string(".nu-env trusted!").into_value(tag), UntaggedValue::string(".nu-env trusted!").into_value(tag),

9
crates/nu-cli/src/commands/autoenv_untrust.rs
View File

@ -78,9 +78,12 @@ impl WholeStreamCommand for AutoenvUnTrust {
)); ));
} }
let tomlstr = toml::to_string(&allowed).or_else(|_| Err(ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")))?; let tomlstr = toml::to_string(&allowed).or_else(|_| {
fs::write(config_path, tomlstr) Err(ShellError::untagged_runtime_error(
.expect("Couldn't write to toml file"); "Couldn't serialize allowed dirs to nu-env.toml",
))
})?;
fs::write(config_path, tomlstr).expect("Couldn't write to toml file");
Ok(OutputStream::one(ReturnSuccess::value( Ok(OutputStream::one(ReturnSuccess::value(
UntaggedValue::string(".nu-env untrusted!").into_value(tag), UntaggedValue::string(".nu-env untrusted!").into_value(tag),

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

@ -42,9 +42,10 @@ impl DirectorySpecificEnvironment {
== Some(&hasher.finish().to_string()) == Some(&hasher.finish().to_string())
{ {
return Ok(content.parse::<toml::Value>().or_else(|_| { return Ok(content.parse::<toml::Value>().or_else(|_| {
Err(ShellError::untagged_runtime_error( Err(ShellError::untagged_runtime_error(format!(
format!("Could not parse {:?}. Is it well-formed?", wdirenv) "Could not parse {:?}. Is it well-formed?",
)) wdirenv
)))
})?); })?);
} }
return Err(ShellError::untagged_runtime_error( return Err(ShellError::untagged_runtime_error(