diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs index 832a70c2..72aff5d2 100644 --- a/helix-dap/src/client.rs +++ b/helix-dap/src/client.rs @@ -54,7 +54,7 @@ impl Client { port_arg: Option, id: usize, ) -> Result<(Self, UnboundedReceiver)> { - if command == "" { + if command.is_empty() { return Result::Err(Error::Other(anyhow!("Command not provided"))); } if transport == "tcp" && port_arg.is_some() { diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs index 3f925490..a7cf7e81 100644 --- a/helix-term/src/commands/dap.rs +++ b/helix-term/src/commands/dap.rs @@ -232,9 +232,10 @@ pub fn dap_start_impl( if cfg.completion == Some("filename".to_owned()) || cfg.completion == Some("directory".to_owned()) { - param = std::fs::canonicalize(x).ok() + param = std::fs::canonicalize(x) + .ok() .and_then(|pb| pb.into_os_string().into_string().ok()) - .unwrap_or(x.to_string()); + .unwrap_or_else(|| x.to_string()); } } // For param #0 replace {0} in args