diff options
| author | Yuki Kodama <endflow.net@gmail.com> | 2020-05-24 23:43:44 +0900 |
|---|---|---|
| committer | Yuki Kodama <endflow.net@gmail.com> | 2020-05-26 01:06:25 +0900 |
| commit | 408d04764cd00a9f24fce15198ec26d7c74fb4d6 (patch) | |
| tree | 51261555a0a0a9b7e1799f27bcbf87cb10966937 | |
| parent | 378bfc3c8f1c63f44f972e11c9de00f9733b13c0 (diff) | |
| download | rust-408d04764cd00a9f24fce15198ec26d7c74fb4d6.tar.gz rust-408d04764cd00a9f24fce15198ec26d7c74fb4d6.zip | |
Use built-in method
| -rw-r--r-- | crates/ra_ide/src/display/function_signature.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs index 4f054398a94..fabc78f1408 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()), ); |
