diff options
author | Thayne McCombs <astrothayne@gmail.com> | 2022-11-08 11:56:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-08 11:56:12 -0700 |
commit | 9e88f91c2275449a95f06fd33b2be5c18e358e7f (patch) | |
tree | f426f32a776090ee30e3297b54956cb6d038cfb4 | |
parent | bba7e0acd85b2f89eff058815fcb80f642d54fb6 (diff) | |
parent | 0773b3067ee971dcae36cef1f643baea67b75083 (diff) |
Merge pull request #1168 from tmccombs/clippy-fixes-2
Fix some warnings from clippy
-rw-r--r-- | src/cli.rs | 2 | ||||
-rw-r--r-- | src/exec/mod.rs | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -807,7 +807,7 @@ impl clap::Args for Exec { .allow_hyphen_values(true) .value_terminator(";") .value_name("cmd") - .conflicts_with_all(&["exec", "list_details"]) + .conflicts_with_all(["exec", "list_details"]) .help("Execute a command with all search results at once") .long_help( "Execute the given command once, with all search results as arguments.\n\ diff --git a/src/exec/mod.rs b/src/exec/mod.rs index 35d7b83..167368b 100644 --- a/src/exec/mod.rs +++ b/src/exec/mod.rs @@ -148,7 +148,7 @@ impl CommandBuilder { for arg in &template.args { if arg.has_tokens() { path_arg = Some(arg.clone()); - } else if path_arg == None { + } else if path_arg.is_none() { pre_args.push(arg.generate("", None)); } else { post_args.push(arg.generate("", None)); @@ -301,9 +301,9 @@ impl CommandTemplate { /// Using the internal `args` field, and a supplied `input` variable, a `Command` will be /// build. fn generate(&self, input: &Path, path_separator: Option<&str>) -> io::Result<Command> { - let mut cmd = Command::new(self.args[0].generate(&input, path_separator)); + let mut cmd = Command::new(self.args[0].generate(input, path_separator)); for arg in &self.args[1..] { - cmd.try_arg(arg.generate(&input, path_separator))?; + cmd.try_arg(arg.generate(input, path_separator))?; } Ok(cmd) } |