From 9d19e5b962f77259dd1334b9edb4da4de54f0987 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Fri, 2 Oct 2020 21:38:22 +0300 Subject: Properly name the field --- crates/base_db/src/input.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/base_db/src') diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs index 251a7b245..c330314d4 100644 --- a/crates/base_db/src/input.rs +++ b/crates/base_db/src/input.rs @@ -127,10 +127,11 @@ impl PartialEq for ProcMacro { pub struct CrateData { pub root_file_id: FileId, pub edition: Edition, - /// The name to display to the end user. - /// This actual crate name can be different in a particular dependent crate - /// or may even be missing for some cases, such as a dummy crate for the code snippet. - pub display_name: Option, + /// 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, pub cfg_options: CfgOptions, pub env: Env, pub dependencies: Vec, @@ -159,7 +160,7 @@ impl CrateGraph { &mut self, file_id: FileId, edition: Edition, - display_name: Option, + declaration_name: Option, cfg_options: CfgOptions, env: Env, proc_macro: Vec<(SmolStr, Arc)>, @@ -170,7 +171,7 @@ impl CrateGraph { let data = CrateData { root_file_id: file_id, edition, - display_name, + declaration_name, cfg_options, env, proc_macro, -- cgit v1.2.3