From 41d73d131266c864495ce592749b74f580b17b23 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 10 Dec 2020 18:51:39 +0100 Subject: Replicate Cargo environment variables --- crates/project_model/src/cargo_workspace.rs | 39 +++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index e6491b754..4c1ba5e75 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -192,6 +192,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 +388,39 @@ 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 +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_ + + 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()).collect::>(); + let pre = pre.join("."); + env.push(("CARGO_PKG_VERSION_PRE".into(), pre)); + + 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)); +} -- cgit v1.2.3 From 4d4b91117a02b55e913216459ae661d8dd166579 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 10 Dec 2020 19:29:11 +0100 Subject: Use itertools --- Cargo.lock | 1 + crates/project_model/Cargo.toml | 1 + crates/project_model/src/cargo_workspace.rs | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c6994127b..d3aec4c99 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 e0c591603..c55e85709 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 4c1ba5e75..894c5c952 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; @@ -407,9 +408,8 @@ fn inject_cargo_env(package: &cargo_metadata::Package, env: &mut Vec<(String, St 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()).collect::>(); - let pre = pre.join("."); - env.push(("CARGO_PKG_VERSION_PRE".into(), pre)); + 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)); -- cgit v1.2.3