Skip to content

Commit 9d4fdc0

Browse files
committed
Show lifetime args if there are only error ones
1 parent 9dad25a commit 9d4fdc0

File tree

1 file changed

+2
-12
lines changed
  • src/tools/rust-analyzer/crates/hir-ty/src

1 file changed

+2
-12
lines changed

src/tools/rust-analyzer/crates/hir-ty/src/display.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,17 +1438,7 @@ fn hir_fmt_generics(
14381438

14391439
let parameters_to_write = generic_args_sans_defaults(f, generic_def, parameters);
14401440

1441-
// FIXME: Remote this
1442-
// most of our lifetimes will be errors as we lack elision and inference
1443-
// so don't render them for now
1444-
let only_err_lifetimes = !cfg!(test)
1445-
&& parameters_to_write.iter().all(|arg| {
1446-
matches!(
1447-
arg.data(Interner),
1448-
chalk_ir::GenericArgData::Lifetime(it) if *it.data(Interner) == LifetimeData::Error
1449-
)
1450-
});
1451-
if !parameters_to_write.is_empty() && !only_err_lifetimes {
1441+
if !parameters_to_write.is_empty() {
14521442
write!(f, "<")?;
14531443
hir_fmt_generic_arguments(f, parameters_to_write, self_)?;
14541444
write!(f, ">")?;
@@ -1881,7 +1871,7 @@ impl HirDisplay for DomainGoal {
18811871
wc.hir_fmt(f)?;
18821872
write!(f, ")")?;
18831873
}
1884-
_ => write!(f, "?")?,
1874+
_ => write!(f, "_")?,
18851875
}
18861876
Ok(())
18871877
}

0 commit comments

Comments
 (0)