From 408d04764cd00a9f24fce15198ec26d7c74fb4d6 Mon Sep 17 00:00:00 2001
From: Yuki Kodama <endflow.net@gmail.com>
Date: Sun, 24 May 2020 23:43:44 +0900
Subject: Use built-in method

---
 crates/ra_ide/src/display/function_signature.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index 4f054398a..fabc78f14 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -187,14 +187,6 @@ impl FunctionSignature {
 
 impl From<&'_ ast::FnDef> for FunctionSignature {
     fn from(node: &ast::FnDef) -> FunctionSignature {
-        fn strip_leading_underscore(name: String) -> String {
-            if name.starts_with("_") {
-                name.get(1..).unwrap_or_default().to_string()
-            } else {
-                name
-            }
-        }
-
         fn param_list(node: &ast::FnDef) -> (bool, Vec<String>, Vec<String>) {
             let mut res = vec![];
             let mut res_types = vec![];
@@ -238,15 +230,17 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
                     param_list
                         .params()
                         .map(|param| {
-                            Some(strip_leading_underscore(
+                            Some(
                                 param
                                     .pat()?
                                     .syntax()
                                     .descendants()
                                     .find_map(ast::Name::cast)?
                                     .text()
-                                    .to_string(),
-                            ))
+                                    .to_string()
+                                    .trim_start_matches('_')
+                                    .into(),
+                            )
                         })
                         .map(|param| param.unwrap_or_default()),
                 );
-- 
cgit v1.2.3