user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19376 from Veykril/push-ultzutkwqupt

Browse source 
minor: Remove unnecessary allocations in `function::params_display`
This commit is contained in:
Lukas Wirth 2025-03-16 14:35:16 +00:00 • committed by GitHub
commit d89aefd5f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/tools/rust-analyzer/crates/ide-completion/src/render/function.rs
View file

@ -320,7 +320,9 @@ fn detail(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
format_to!(detail, "unsafe ");
}
format_to!(detail, "fn({})", params_display(ctx, func));
detail.push_str("fn(");
params_display(ctx, &mut detail, func);
detail.push(')');
if !ret_ty.is_unit() {
format_to!(detail, " -> {}", ret_ty.display(ctx.db, ctx.display_target));
}
@ -342,31 +344,29 @@ fn detail_full(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
detail
}
fn params_display(ctx: &CompletionContext<'_>, func: hir::Function) -> String {
let mut params = if let Some(self_param) = func.self_param(ctx.db) {
fn params_display(ctx: &CompletionContext<'_>, detail: &mut String, func: hir::Function) {
if let Some(self_param) = func.self_param(ctx.db) {
format_to!(detail, "{}", self_param.display(ctx.db, ctx.display_target));
let assoc_fn_params = func.assoc_fn_params(ctx.db);
let params = assoc_fn_params
.iter()
.skip(1) // skip the self param because we are manually handling that
.map(|p| p.ty().display(ctx.db, ctx.display_target));
format!(
"{}{}",
self_param.display(ctx.db, ctx.display_target),
params.format_with("", |display, f| {
f(&", ")?;
f(&display)
})
)
for param in params {
format_to!(detail, ", {}", param);
}
} else {
let assoc_fn_params = func.assoc_fn_params(ctx.db);
assoc_fn_params.iter().map(|p| p.ty().display(ctx.db, ctx.display_target)).join(", ")
};
if func.is_varargs(ctx.db) {
params.push_str(", ...");
format_to!(
detail,
"{}",
assoc_fn_params.iter().map(|p| p.ty().display(ctx.db, ctx.display_target)).format(", ")
);
}
params
if func.is_varargs(ctx.db) {
detail.push_str(", ...");
}
}
fn params(