2 files changed, 17 insertions, 6 deletions

diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index d1e7602fc..e92cfea59 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -13,7 +13,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
-use base_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
+use base_db::{CrateDisplayName, CrateGraph, CrateId, CrateName, Edition, Env, FileId};
 use cfg::CfgOptions;
 use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -335,8 +335,7 @@ impl ProjectWorkspace {
                             crate_graph.add_crate_root(
                                 file_id,
                                 krate.edition,
-                                // FIXME json definitions can store the crate name
-                                None,
+                                krate.display_name.clone(),
                                 cfg_options,
                                 env,
                                 proc_macro.unwrap_or_default(),
@@ -408,10 +407,12 @@ impl ProjectWorkspace {
                                 .map(|it| proc_macro_client.by_dylib_path(&it))
                                 .unwrap_or_default();
 
+                            let display_name =
+                                CrateDisplayName::from_canonical_name(cargo[pkg].name.clone());
                             let crate_id = crate_graph.add_crate_root(
                                 file_id,
                                 edition,
-                                Some(CrateName::normalize_dashes(&cargo[pkg].name)),
+                                Some(display_name),
                                 cfg_options,
                                 env,
                                 proc_macro.clone(),
@@ -485,6 +486,11 @@ impl ProjectWorkspace {
                 }
             }
         }
+        if crate_graph.patch_cfg_if() {
+            log::debug!("Patched std to depend on cfg-if")
+        } else {
+            log::debug!("Did not patch std to depend on cfg-if")
+        }
         crate_graph
     }
 }
@@ -551,7 +557,7 @@ fn sysroot_to_crate_graph(
             let crate_id = crate_graph.add_crate_root(
                 file_id,
                 Edition::Edition2018,
-                Some(name),
+                Some(name.into()),
                 cfg_options.clone(),
                 env,
                 proc_macro,
diff --git a/crates/project_model/src/project_json.rs b/crates/project_model/src/project_json.rs
index a6895ecdd..aab279223 100644
--- a/crates/project_model/src/project_json.rs
+++ b/crates/project_model/src/project_json.rs
@@ -2,7 +2,7 @@
 
 use std::path::PathBuf;
 
-use base_db::{CrateId, CrateName, Dependency, Edition};
+use base_db::{CrateDisplayName, CrateId, CrateName, Dependency, Edition};
 use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::FxHashMap;
 use serde::{de, Deserialize};
@@ -21,6 +21,7 @@ pub struct ProjectJson {
 /// useful in creating the crate graph.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Crate {
+    pub(crate) display_name: Option<CrateDisplayName>,
     pub(crate) root_module: AbsPathBuf,
     pub(crate) edition: Edition,
     pub(crate) deps: Vec<Dependency>,
@@ -68,6 +69,9 @@ impl ProjectJson {
                     };
 
                     Crate {
+                        display_name: crate_data
+                            .display_name
+                            .map(CrateDisplayName::from_canonical_name),
                         root_module,
                         edition: crate_data.edition.into(),
                         deps: crate_data
@@ -114,6 +118,7 @@ pub struct ProjectJsonData {
 
 #[derive(Deserialize)]
 struct CrateData {
+    display_name: Option<String>,
     root_module: PathBuf,
     edition: EditionData,
     deps: Vec<DepData>,