Diagnostics: show closure signatures (configurable)

[ali90h]

Type-mismatch messages now respect the existing rust-analyzer.inlayHints.closureStyle setting.Default stays {closure#…}. If users set ImplFn, diagnostics render impl Fn… signatures.

• Add closure_style to DiagnosticsConfig (default ClosureWithId)
• Use ctx.config.closure_style in the type-mismatch handler
• Reuse the existing inlayHints.closureStyle (no new setting)
• Add focused tests for both styles

Before / After

Example 1

Code

fn main() {
    let _: bool = || { 0u8 };
}

Before

error: expected bool, found {closure#12345}

After (with ImplFn):

error: expected bool, found impl Fn() -> u8

---

Example 2

Code

fn needs_f(_: impl FnMut(&i32) -> bool) {}
fn main() {
    let g = |_x: &u32| -> bool { true };
    needs_f(g);
}

Before

error: expected {closure#…}, found {closure#…}

After (with ImplFn):

error: expected impl FnMut(&i32) -> bool, found impl FnMut(&u32) -> bool

Refs #20555

[davidbarsky]

Thanks! Instead of creating a crates/hir-ty/src/mir/lower/tests.rs, can you move the test to somewhere in crates/hir-ty/src/tests?

[ChayimFriedman2]

I personally think we should not switch this. Unlike other IDE features, the identity of a closure is important for mismatches (different closures are not the same).

But if we do, a setting most likely will make sense, like we do for inlay hints (rust-analyzer.inlayHints.closureStyle). We can also unify the settings.

[ali90h]

Thanks! Instead of creating a crates/hir-ty/src/mir/lower/tests.rs, can you move the test to somewhere in crates/hir-ty/src/tests?

Thanks! That hir-ty test came from an upstream commit slipped into my branch. I’ve rebased; this PR now only changes ide-diagnostics and the focused test. No hir-ty files are part of this PR anymore.

[ali90h]

I personally think we should not switch this. Unlike other IDE features, the identity of a closure is important for mismatches (different closures are not the same).

But if we do, a setting most likely will make sense, like we do for inlay hints (rust-analyzer.inlayHints.closureStyle). We can also unify the settings.

Thank you, the update has been completed.
I'd love to hear your feedback.

No behavior change by default; setting ImplFn shows signatures in diagnostics.

[flodiebold]

IMO we should just do whatever rustc does here?

[ali90h]

IMO we should just do whatever rustc does here?

Checked against rustc: in the simple case it prints “closure”, and in bound cases it shows a fn(..) -> _ signature. So there isn’t one single format to match. This PR keeps diagnostics configurable; users can pick RANotation today for a rustc-like shape. If there’s agreement to make that the default, I can do it in a small follow-up.

[ChayimFriedman2]

Generally I'm onboard with this, but I do prefer to keep the current style the default (can be done by making inlayHints_closureStyle be Option<ClosureStyle> then matching on that).

Also, maybe we should rename the setting given it's no longer inlay-hint-only? Not sure.

[ChayimFriedman2]

Struct update syntax (Struct { ..FOO }) is useful here.

[ChayimFriedman2]

Since inlay hints also do this conversion, better to extract it into a function (or a From implementation).

[rustbot]

☔ The latest upstream changes (possibly #21804) made this pull request unmergeable. Please resolve the merge conflicts.