diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-10 18:30:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 18:30:11 +0000 |
| commit | 41321d96789ed918eebda02ada76758765d19d16 (patch) | |
| tree | 1d2b0272f9ae48e143b2e6fa7260c6664eb40b03 | |
| parent | 814e31957ea0e063272132afd15c3e8f4ed54454 (diff) | |
| parent | 4d4b91117a02b55e913216459ae661d8dd166579 (diff) | |
| download | rust-41321d96789ed918eebda02ada76758765d19d16.tar.gz rust-41321d96789ed918eebda02ada76758765d19d16.zip | |
Merge #6807
6807: Replicate Cargo environment variables r=jonas-schievink a=jonas-schievink These might be relied on by procedural macros, and can also be accessed via `env!`. Required for fixing https://github.com/rust-analyzer/rust-analyzer/issues/6696. We do not yet propagate these to any proc macros though. Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | crates/project_model/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/project_model/src/cargo_workspace.rs | 39 |
3 files changed, 41 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index c6994127b50..d3aec4c996b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1229,6 +1229,7 @@ dependencies = [ "base_db", "cargo_metadata", "cfg", + "itertools", "log", "paths", "proc_macro_api", diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml index e0c591603eb..c55e8570922 100644 --- a/crates/project_model/Cargo.toml +++ b/crates/project_model/Cargo.toml @@ -16,6 +16,7 @@ cargo_metadata = "=0.12.0" serde = { version = "1.0.106", features = ["derive"] } serde_json = "1.0.48" anyhow = "1.0.26" +itertools = "0.9.0" arena = { path = "../arena", version = "0.0.0" } cfg = { path = "../cfg", version = "0.0.0" } diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index e6491b75444..894c5c952aa 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -11,6 +11,7 @@ use anyhow::{Context, Result}; use arena::{Arena, Idx}; use base_db::Edition; use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; +use itertools::Itertools; use paths::{AbsPath, AbsPathBuf}; use rustc_hash::FxHashMap; @@ -192,6 +193,9 @@ impl CargoWorkspace { meta.packages.sort_by(|a, b| a.id.cmp(&b.id)); for meta_pkg in meta.packages { + let id = meta_pkg.id.clone(); + inject_cargo_env(&meta_pkg, envs.entry(id).or_default()); + let cargo_metadata::Package { id, edition, name, manifest_path, version, .. } = meta_pkg; let is_member = ws_members.contains(&id); @@ -385,3 +389,38 @@ fn is_dylib(path: &Path) -> bool { Some(ext) => matches!(ext.as_str(), "dll" | "dylib" | "so"), } } + +/// Recreates the compile-time environment variables that Cargo sets. +/// +/// Should be synced with <https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-crates> +fn inject_cargo_env(package: &cargo_metadata::Package, env: &mut Vec<(String, String)>) { + // FIXME: Missing variables: + // CARGO, CARGO_PKG_HOMEPAGE, CARGO_CRATE_NAME, CARGO_BIN_NAME, CARGO_BIN_EXE_<name> + + let mut manifest_dir = package.manifest_path.clone(); + manifest_dir.pop(); + if let Some(cargo_manifest_dir) = manifest_dir.to_str() { + env.push(("CARGO_MANIFEST_DIR".into(), cargo_manifest_dir.into())); + } + + env.push(("CARGO_PKG_VERSION".into(), package.version.to_string())); + env.push(("CARGO_PKG_VERSION_MAJOR".into(), package.version.major.to_string())); + env.push(("CARGO_PKG_VERSION_MINOR".into(), package.version.minor.to_string())); + env.push(("CARGO_PKG_VERSION_PATCH".into(), package.version.patch.to_string())); + + let pre = package.version.pre.iter().map(|id| id.to_string()).format("."); + env.push(("CARGO_PKG_VERSION_PRE".into(), pre.to_string())); + + let authors = package.authors.join(";"); + env.push(("CARGO_PKG_AUTHORS".into(), authors)); + + env.push(("CARGO_PKG_NAME".into(), package.name.clone())); + env.push(("CARGO_PKG_DESCRIPTION".into(), package.description.clone().unwrap_or_default())); + //env.push(("CARGO_PKG_HOMEPAGE".into(), package.homepage.clone().unwrap_or_default())); + env.push(("CARGO_PKG_REPOSITORY".into(), package.repository.clone().unwrap_or_default())); + env.push(("CARGO_PKG_LICENSE".into(), package.license.clone().unwrap_or_default())); + + let license_file = + package.license_file.as_ref().map(|buf| buf.display().to_string()).unwrap_or_default(); + env.push(("CARGO_PKG_LICENSE_FILE".into(), license_file)); +} |
