diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-20 16:15:58 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-20 16:15:58 +0100 |
| commit | f925735e64cb6aed85f28cacc0a91c1c1bc06bb4 (patch) | |
| tree | 8ac8a8f761db3bd3b60446001739b94bb1ed44dd /crates/project_model/src/lib.rs | |
| parent | 1c24f57ef8420e924e904ec481e7c6471f3ddcc8 (diff) | |
| parent | f753c3ecd20c4a448403d2d7d9b334a289f9e5b3 (diff) | |
Merge #6297
6297: Support Display name in project.json r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/project_model/src/lib.rs')
| -rw-r--r-- | crates/project_model/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs index 5db41bc16..e92cfea59 100644 --- a/crates/project_model/src/lib.rs +++ b/crates/project_model/src/lib.rs | |||
| @@ -335,8 +335,7 @@ impl ProjectWorkspace { | |||
| 335 | crate_graph.add_crate_root( | 335 | crate_graph.add_crate_root( |
| 336 | file_id, | 336 | file_id, |
| 337 | krate.edition, | 337 | krate.edition, |
| 338 | // FIXME json definitions can store the crate name | 338 | krate.display_name.clone(), |
| 339 | None, | ||
| 340 | cfg_options, | 339 | cfg_options, |
| 341 | env, | 340 | env, |
| 342 | proc_macro.unwrap_or_default(), | 341 | proc_macro.unwrap_or_default(), |