diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-16 10:33:13 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-16 10:33:13 +0000 |
commit | 2eb1677b12f15a377111e877f6a09e1a1550c8be (patch) | |
tree | 65212bd2a271776683682c76c7f033abe83a907d /crates/ra_project_model/src/lib.rs | |
parent | 200c275c2e9955371e61f6ad7684084655df46fc (diff) | |
parent | 92fd430dab8cd0c7a476ccc5db87607f3f0f00a2 (diff) |
Merge #3603
3603: Fix crate display name dashes r=matklad a=SomeoneToIgnore
A follow-up of https://github.com/rust-analyzer/rust-analyzer/pull/3602#discussion_r392733525
Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index a6274709d..897874813 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -245,7 +245,10 @@ impl ProjectWorkspace { | |||
245 | let crate_id = crate_graph.add_crate_root( | 245 | let crate_id = crate_graph.add_crate_root( |
246 | file_id, | 246 | file_id, |
247 | Edition::Edition2018, | 247 | Edition::Edition2018, |
248 | Some(krate.name(&sysroot).to_string()), | 248 | Some( |
249 | CrateName::new(krate.name(&sysroot)) | ||
250 | .expect("Sysroot crate names should not contain dashes"), | ||
251 | ), | ||
249 | cfg_options, | 252 | cfg_options, |
250 | env, | 253 | env, |
251 | extern_source, | 254 | extern_source, |
@@ -296,7 +299,7 @@ impl ProjectWorkspace { | |||
296 | let crate_id = crate_graph.add_crate_root( | 299 | let crate_id = crate_graph.add_crate_root( |
297 | file_id, | 300 | file_id, |
298 | edition, | 301 | edition, |
299 | Some(pkg.name(&cargo).to_string()), | 302 | Some(CrateName::normalize_dashes(pkg.name(&cargo))), |
300 | cfg_options, | 303 | cfg_options, |
301 | env, | 304 | env, |
302 | extern_source, | 305 | extern_source, |