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

Rename declaration_name -> display_name

Browse source 
Declaration names sounds like a name of declaration -- something you
can use for analysis. It empathically isn't, and is just a label
displayed in various UI. It's important not to confuse the two, least
we accidentally mix semantics with UI (I believe, there's already a
case of this in the FamousDefs at least).
This commit is contained in:
Aleksey Kladov 2020-10-20 15:38:11 +02:00
parent be762ccccd
commit af4e75533f
11 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/base_db/src/input.rs
View file

@ -127,11 +127,13 @@ impl PartialEq for ProcMacro {
pub struct CrateData {
pub root_file_id: FileId,
pub edition: Edition,
/// A name used in the package's project declaration: for Cargo projects, it's [package].name,
/// can be different for other project types or even absent (a dummy crate for the code snippet, for example).
/// NOTE: The crate can be referenced as a dependency under a different name,
/// this one should be used when working with crate hierarchies.
pub declaration_name: Option<CrateName>,
/// A name used in the package's project declaration: for Cargo projects,
/// it's [package].name, can be different for other project types or even
/// absent (a dummy crate for the code snippet, for example).
///
/// For purposes of analysis, crates are anonymous (only names in
/// `Dependency` matters), this name should only be used for UI.
pub display_name: Option<CrateName>,
pub cfg_options: CfgOptions,
pub env: Env,
pub dependencies: Vec<Dependency>,
@ -160,7 +162,7 @@ impl CrateGraph {
&mut self,
file_id: FileId,
edition: Edition,
declaration_name: Option<CrateName>,
display_name: Option<CrateName>,
cfg_options: CfgOptions,
env: Env,
proc_macro: Vec<(SmolStr, Arc<dyn tt::TokenExpander>)>,
@ -171,7 +173,7 @@ impl CrateGraph {
let data = CrateData {
root_file_id: file_id,
edition,
declaration_name,
display_name,
cfg_options,
env,
proc_macro,
@ -310,8 +312,8 @@ impl CrateGraph {
}
}
fn hacky_find_crate(&self, declaration_name: &str) -> Option<CrateId> {
self.iter().find(|it| self[*it].declaration_name.as_deref() == Some(declaration_name))
fn hacky_find_crate(&self, display_name: &str) -> Option<CrateId> {
self.iter().find(|it| self[*it].display_name.as_deref() == Some(display_name))
}
}