Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-27 20:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_db/src/input.rs
View file

@ -14,6 +14,7 @@ use rustc_hash::FxHashMap;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use crate::{RelativePath, RelativePathBuf}; use crate::{RelativePath, RelativePathBuf};
use fmt::Display;
/// `FileId` is an integer which uniquely identifies a file. File paths are /// `FileId` is an integer which uniquely identifies a file. File paths are
/// messy and system-dependent, so most of the code should work directly with /// messy and system-dependent, so most of the code should work directly with
@ -102,9 +103,11 @@ impl CrateName {
pub fn normalize_dashes(name: &str) -> CrateName { pub fn normalize_dashes(name: &str) -> CrateName {
Self(SmolStr::new(name.replace('-', "_"))) Self(SmolStr::new(name.replace('-', "_")))
} }
}
pub fn get_name(&self) -> String { impl Display for CrateName {
self.0.to_string() fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.0)
} }
} }

2
crates/ra_hir_def/src/nameres.rs
View file

@ -181,7 +181,7 @@ impl CrateDefMap {
db.crate_graph()[krate] db.crate_graph()[krate]
.display_name .display_name
.as_ref() .as_ref()
.map(|name| name.get_name()) .map(ToString::to_string)
.unwrap_or_default() .unwrap_or_default()
}); });
let def_map = { let def_map = {

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