From c39d9f44a0afb041f73d87c69787fea5f6747ffd Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Sun, 7 Nov 2021 21:55:57 +0900
Subject: dap: Simplify debug_parameter_prompt

---
 helix-term/src/commands/dap.rs | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index a8d9ceb9..719520af 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -227,9 +227,7 @@ pub fn dap_start_impl(
             for (i, x) in params.iter().enumerate() {
                 let mut param = x.to_string();
                 if let Some(DebugConfigCompletion::Advanced(cfg)) = template.completion.get(i) {
-                    if cfg.completion == Some("filename".to_owned())
-                        || cfg.completion == Some("directory".to_owned())
-                    {
+                    if matches!(cfg.completion.as_deref(), Some("filename" | "directory")) {
                         param = std::fs::canonicalize(x)
                             .ok()
                             .and_then(|pb| pb.into_os_string().into_string().ok())
@@ -330,27 +328,23 @@ fn debug_parameter_prompt(
     config_name: String,
     mut params: Vec<String>,
 ) -> Prompt {
-    let i = params.len();
-    let completion = completions.get(i).unwrap();
+    let completion = completions.get(params.len()).unwrap();
     let field_type = if let DebugConfigCompletion::Advanced(cfg) = completion {
-        cfg.completion.clone().unwrap_or_else(|| "".to_owned())
+        cfg.completion.as_deref().unwrap_or("")
     } else {
-        "".to_owned()
+        ""
     };
     let name = match completion {
-        DebugConfigCompletion::Advanced(cfg) => {
-            cfg.name.clone().unwrap_or_else(|| field_type.to_owned())
-        }
-        DebugConfigCompletion::Named(name) => name.clone(),
+        DebugConfigCompletion::Advanced(cfg) => cfg.name.as_deref().unwrap_or(field_type),
+        DebugConfigCompletion::Named(name) => name.as_str(),
     };
     let default_val = match completion {
-        DebugConfigCompletion::Advanced(cfg) => {
-            cfg.default.clone().unwrap_or_else(|| "".to_owned())
-        }
-        _ => "".to_owned(),
-    };
+        DebugConfigCompletion::Advanced(cfg) => cfg.default.as_deref().unwrap_or(""),
+        _ => "",
+    }
+    .to_owned();
 
-    let completer = match &field_type[..] {
+    let completer = match field_type {
         "filename" => ui::completers::filename,
         "directory" => ui::completers::directory,
         _ => |_input: &str| Vec::new(),
-- 
cgit v1.2.3-70-g09d2