extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-19 13:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Silence Rust 1.45 Clippy warnings (#2196)

Browse Source 
* Silence Rust 1.45 Clippy warnings dealing with using `map_err()`

* Silence false Clippy warning

* Fix last Clippy error for unnecessary conversion

* Fix `and_then` clippy warnings
This commit is contained in:
Joseph T. Lyons
2020-07-17 13:57:15 -04:00
committed by GitHub
parent 0f688d7da7
commit f26151e36d
6 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-cli/src/commands/autoenv.rs
View File

@@ -36,11 +36,7 @@ pub fn read_trusted() -> Result<Trusted, ShellError> {
.create(true)
.write(true)
.open(config_path)
.or_else(|_| {
Err(ShellError::untagged_runtime_error(
"Couldn't open nu-env.toml",
))
})?;
.map_err(|_| ShellError::untagged_runtime_error("Couldn't open nu-env.toml"))?;
let mut doc = String::new();
file.read_to_string(&mut doc)?;

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

@@ -54,10 +54,8 @@ impl WholeStreamCommand for AutoenvTrust {
.insert(filename, Sha256::digest(&content).as_slice().to_vec());
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).map_err(|_| {
ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")
})?;
fs::write(config_path, tomlstr).expect("Couldn't write to toml file");

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

@@ -78,10 +78,8 @@ 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).map_err(|_| {
ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")
})?;
fs::write(config_path, tomlstr).expect("Couldn't write to toml file");

11
crates/nu-cli/src/commands/str_/substring.rs
View File

@@ -141,15 +141,8 @@ fn action(input: &Value, options: &Substring, tag: impl Into<Tag>) -> Result<Val
)
})?;
let start: isize = options.0.try_into().map_err(|_| {
ShellError::labeled_error(
"could not perform substring",
"could not perform substring",
tag.span,
)
})?;
let end = options.1;
let start: isize = options.0;
let end: isize = options.1;
if start < len && end >= 0 {
match start.cmp(&end) {