Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-04 01:42:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use built-in method

Browse Source
This commit is contained in:
Yuki Kodama
2020-05-24 23:43:44 +09:00
parent 378bfc3c8f
commit 408d04764c
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ra_ide/src/display/function_signature.rs
+5 -11
View File
@@ -187,14 +187,6 @@ pub(crate) fn from_macro(db: &RootDatabase, macro_def: hir::MacroDef) -> Option<
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 @@ fn param_name_list(node: &ast::FnDef) -> Vec<String> {
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()),
);