Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18028 - Veykril:lifetime-hints-panic, r=Veykril

Browse source 
fix: lifetime hint panic in non generic defs
This commit is contained in:
bors 2024-09-02 16:05:36 +00:00
commit 5461f494e6
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/ide/src/inlay_hints/lifetime.rs
View file

@ -389,7 +389,9 @@ fn hints_(
}
(None, allocated_lifetimes) => on_missing_gpl(acc, allocated_lifetimes),
}
ctx.lifetime_stacks.last_mut().unwrap().extend(allocated_lifetimes);
if let Some(stack) = ctx.lifetime_stacks.last_mut() {
stack.extend(allocated_lifetimes);
}
Some(())
}
@ -542,6 +544,22 @@ fn fn_trait(a: &impl Fn(&()) -> &()) {}
// ^^ for<'1>
//^'1
// ^'1
"#,
);
}
#[test]
fn hints_in_non_gen_defs() {
check_with_config(
InlayHintsConfig {
lifetime_elision_hints: LifetimeElisionHints::Always,
..TEST_CONFIG
},
r#"
const _: fn(&()) -> &();
//^^ for<'0>
//^'0
//^'0
"#,
);
}