language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 05:13:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Populate cargo config env vars for crates

Browse source
This commit is contained in:
Lukas Wirth 2024-12-31 14:26:29 +01:00
parent c86dd17cb3
commit fd4635c99c
7 changed files with 43 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/project-model/src/cargo_workspace.rs
View file

@ -4,6 +4,7 @@ use std::ops;
use std::str::from_utf8;
use anyhow::Context;
use base_db::Env;
use cargo_metadata::{CargoOpt, MetadataCommand};
use la_arena::{Arena, Idx};
use paths::{AbsPath, AbsPathBuf, Utf8PathBuf};
@ -34,6 +35,8 @@ pub struct CargoWorkspace {
target_directory: AbsPathBuf,
manifest_path: ManifestPath,
is_virtual_workspace: bool,
/// Environment variables set in the `.cargo/config` file.
config_env: Env,
}
impl ops::Index<Package> for CargoWorkspace {
@ -395,6 +398,7 @@ impl CargoWorkspace {
pub fn new(
mut meta: cargo_metadata::Metadata,
ws_manifest_path: ManifestPath,
cargo_config_env: Env,
) -> CargoWorkspace {
let mut pkg_by_id = FxHashMap::default();
let mut packages = Arena::default();
@ -516,6 +520,7 @@ impl CargoWorkspace {
target_directory,
manifest_path: ws_manifest_path,
is_virtual_workspace,
config_env: cargo_config_env,
}
}
@ -602,4 +607,8 @@ impl CargoWorkspace {
pub fn is_virtual_workspace(&self) -> bool {
self.is_virtual_workspace
}
pub fn env(&self) -> &Env {
&self.config_env
}
}