language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Properly name the field

Browse source
This commit is contained in:
Kirill Bulatov 2020-10-02 21:38:22 +03:00
parent 99952f3be2
commit 9d19e5b962
8 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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<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).
/// 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>,
pub cfg_options: CfgOptions,
pub env: Env,
pub dependencies: Vec<Dependency>,
@ -159,7 +160,7 @@ impl CrateGraph {
&mut self,
file_id: FileId,
edition: Edition,
display_name: Option<CrateName>,
declaration_name: Option<CrateName>,
cfg_options: CfgOptions,
env: Env,
proc_macro: Vec<(SmolStr, Arc<dyn tt::TokenExpander>)>,
@ -170,7 +171,7 @@ impl CrateGraph {
let data = CrateData {
root_file_id: file_id,
edition,
display_name,
declaration_name,
cfg_options,
env,
proc_macro,