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

Use cargo name as the CARGO_CRATE_NAME instead of package name

Browse source
This commit is contained in:
Ali Bektas 2023-09-08 01:25:25 +02:00
parent f29867bd26
commit 506a477acf
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project-model/src/workspace.rs
View file

@ -2,7 +2,7 @@
//! metadata` or `rust-project.json`) into representation stored in the salsa
//! database -- `CrateGraph`.
use std::{collections::VecDeque, fmt, fs, process::Command, sync};
use std::{collections::VecDeque, fmt, fs, process::Command, str::FromStr, sync};
use anyhow::{format_err, Context};
use base_db::{
@ -1228,6 +1228,10 @@ fn add_target_crate_root(
let mut env = Env::default();
inject_cargo_env(pkg, &mut env);
if let Ok(cname) = String::from_str(cargo_name) {
// CARGO_CRATE_NAME is the name of the Cargo target with - converted to _, such as the name of the library, binary, example, integration test, or benchmark.
env.set("CARGO_CRATE_NAME", cname.replace("-", "_"));
}
if let Some(envs) = build_data.map(|it| &it.envs) {
for (k, v) in envs {