language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove unnecessary Names from FunctionData::params

Browse source
This commit is contained in:
Lukas Wirth 2023-04-06 20:14:51 +02:00
parent 3f5c9920d6
commit a1b96b1e00
6 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/hir/src/display.rs
View file

@ -8,6 +8,7 @@ use hir_def::{
type_ref::{TypeBound, TypeRef},
AdtId, GenericDefId,
};
use hir_expand::name;
use hir_ty::{
display::{
write_bounds_like_dyn_trait_with_prefix, write_visibility, HirDisplay, HirDisplayError,
@ -76,22 +77,22 @@ impl HirDisplay for Function {
};
let mut first = true;
for (name, type_ref) in &data.params {
// FIXME: Use resolved `param.ty` once we no longer discard lifetimes
for (type_ref, param) in data.params.iter().zip(self.assoc_fn_params(db)) {
let local = param.as_local(db).map(|it| it.name(db));
if !first {
f.write_str(", ")?;
} else {
first = false;
if data.has_self_param() {
if local == Some(name!(self)) {
write_self_param(type_ref, f)?;
continue;
}
}
match name {
match local {
Some(name) => write!(f, "{name}: ")?,
None => f.write_str("_: ")?,
}
// FIXME: Use resolved `param.ty` or raw `type_ref`?
// The former will ignore lifetime arguments currently.
type_ref.hir_fmt(f)?;
}