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

Use target-name for crate-name

Browse source
This commit is contained in:
Edwin Cheng 2020-03-22 01:09:38 +08:00
parent 50c6a315ab
commit d62dd63256
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_project_model/src/lib.rs
View file

@ -336,7 +336,7 @@ impl ProjectWorkspace {
extern_source,
);
if cargo[tgt].kind == TargetKind::Lib {
lib_tgt = Some(crate_id);
lib_tgt = Some((crate_id, cargo[tgt].name.clone()));
pkg_to_lib_crate.insert(pkg, crate_id);
}
if cargo[tgt].is_proc_macro {
@ -363,7 +363,7 @@ impl ProjectWorkspace {
// Set deps to the core, std and to the lib target of the current package
for &from in pkg_crates.get(&pkg).into_iter().flatten() {
if let Some(to) = lib_tgt {
if let Some((to, name)) = lib_tgt.clone() {
if to != from
&& crate_graph
.add_dep(
@ -371,7 +371,7 @@ impl ProjectWorkspace {
// For root projects with dashes in their name,
// cargo metadata does not do any normalization,
// so we do it ourselves currently
CrateName::normalize_dashes(&cargo[pkg].name),
CrateName::normalize_dashes(&name),
to,
)
.is_err()