language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use Display instead of a custom method

Browse source
This commit is contained in:
Kirill Bulatov 2020-03-16 12:03:43 +02:00
parent 059ed25a3e
commit 92fd430dab
3 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,22 +94,17 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String>
fn determine_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> {
let mod_path = def.module(db).map(|module| {
once(
db.crate_graph()[module.krate().into()]
.display_name
.as_ref()
.map(|name| name.get_name()),
)
.chain(
module
.path_to_root(db)
.into_iter()
.rev()
.map(|it| it.name(db).map(|name| name.to_string())),
)
.chain(once(definition_owner_name(db, def)))
.flatten()
.join("::")
once(db.crate_graph()[module.krate().into()].display_name.as_ref().map(ToString::to_string))
.chain(
module
.path_to_root(db)
.into_iter()
.rev()
.map(|it| it.name(db).map(|name| name.to_string())),
)
.chain(once(definition_owner_name(db, def)))
.flatten()
.join("::")
});
mod_path // FIXME: replace dashes with underscores in crate display name
}