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

Merge #4244

Browse source 
4244: Show unsafe trait in hover r=matklad a=DianaNites

Following on #2450 and #4210, for traits.
`unsafe` is the only qualifier they can have, though.

Co-authored-by: Diana <5275194+DianaNites@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-05-01 19:45:48 +00:00 committed by GitHub
commit 8d02b24b25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_ide/src/display/short_label.rs
View file

@ -33,7 +33,11 @@ impl ShortLabel for ast::EnumDef {
impl ShortLabel for ast::TraitDef { impl ShortLabel for ast::TraitDef {
fn short_label(&self) -> Option<String> { fn short_label(&self) -> Option<String> {
short_label_from_node(self, "trait ") if self.unsafe_token().is_some() {
short_label_from_node(self, "unsafe trait ")
} else {
short_label_from_node(self, "trait ")
}
} }
} }

11
crates/ra_ide/src/hover.rs
View file

@ -869,4 +869,15 @@ fn func(foo: i32) { if true { <|>foo; }; }
&[r#"pub(crate) async unsafe extern "C" fn foo()"#], &[r#"pub(crate) async unsafe extern "C" fn foo()"#],
); );
} }
#[test]
fn test_hover_trait_show_qualifiers() {
check_hover_result(
"
//- /lib.rs
unsafe trait foo<|>() {}
",
&["unsafe trait foo"],
);
}
} }