Populate cargo env vars for crate_universe targets

Author: illicitonion

crate_universe/repositories.bzl

@@ -1,6 +1,7 @@
 """A module defining dependencies of the `cargo-bazel` Rust target"""
 
 load("@rules_rust//rust:defs.bzl", "rust_common")
+load("//cargo/cargo_toml_variable_extractor/3rdparty/crates:defs.bzl", ctve_crate_repositories = "crate_repositories")
 load("//crate_universe:deps_bootstrap.bzl", "cargo_bazel_bootstrap")
 load("//crate_universe/3rdparty:third_party_deps.bzl", "third_party_deps")
 load("//crate_universe/3rdparty/crates:crates.bzl", _vendor_crate_repositories = "crate_repositories")
@@ -25,4 +26,5 @@ def crate_universe_dependencies(rust_version = rust_common.default_version, boot
 
     direct_deps = _vendor_crate_repositories()
     direct_deps.extend(crates_vendor_deps())
+    direct_deps.extend(ctve_crate_repositories())
     return direct_deps

crate_universe/src/rendering.rs

@@ -19,9 +19,9 @@ use crate::rendering::template_engine::TemplateEngine;
 use crate::select::Select;
 use crate::splicing::default_splicing_package_crate_id;
 use crate::utils::starlark::{
-    self, Alias, CargoBuildScript, CommonAttrs, Data, ExportsFiles, Filegroup, Glob, Label, Load,
-    Package, RustBinary, RustLibrary, RustProcMacro, SelectDict, SelectList, SelectScalar,
-    SelectSet, Starlark, TargetCompatibleWith,
+    self, Alias, CargoBuildScript, CargoTomlEnvVars, CommonAttrs, Data, ExportsFiles, Filegroup,
+    Glob, Label, Load, Package, RustBinary, RustLibrary, RustProcMacro, SelectDict, SelectList,
+    SelectScalar, SelectSet, Starlark, TargetCompatibleWith,
 };
 use crate::utils::target_triple::TargetTriple;
 use crate::utils::{self, sanitize_repository_name};
@@ -360,6 +360,12 @@ impl Renderer {
         platforms: &Platforms,
         krate: &CrateContext,
     ) -> Result<String> {
+        let mut krate = krate.clone();
+        krate
+            .common_attrs
+            .rustc_env_files
+            .insert(":cargo_toml_env_vars".to_owned(), None);
+
         let mut starlark = Vec::new();
 
         // Banner comment for top of the file.
@@ -433,6 +439,12 @@ impl Renderer {
             starlark.push(Starlark::Package(package));
         }
 
+        load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars");
+        starlark.push(Starlark::CargoTomlEnvVars(CargoTomlEnvVars {
+            name: "cargo_toml_env_vars".to_owned(),
+            src: "Cargo.toml".to_owned(),
+        }));
+
         for rule in &krate.targets {
             if let Some(override_target) = krate.override_targets.get(rule.override_target_key()) {
                 starlark.push(Starlark::Alias(Alias {
@@ -446,7 +458,7 @@ impl Renderer {
                     Rule::BuildScript(target) => {
                         load("@rules_rust//cargo:defs.bzl", "cargo_build_script");
                         let cargo_build_script =
-                            self.make_cargo_build_script(platforms, krate, target)?;
+                            self.make_cargo_build_script(platforms, &krate, target)?;
                         starlark.push(Starlark::CargoBuildScript(cargo_build_script));
                         starlark.push(Starlark::Alias(Alias {
                             rule: AliasRule::default().rule(),
@@ -458,17 +470,17 @@ impl Renderer {
                     Rule::ProcMacro(target) => {
                         load("@rules_rust//rust:defs.bzl", "rust_proc_macro");
                         let rust_proc_macro =
-                            self.make_rust_proc_macro(platforms, krate, target)?;
+                            self.make_rust_proc_macro(platforms, &krate, target)?;
                         starlark.push(Starlark::RustProcMacro(rust_proc_macro));
                     }
                     Rule::Library(target) => {
                         load("@rules_rust//rust:defs.bzl", "rust_library");
-                        let rust_library = self.make_rust_library(platforms, krate, target)?;
+                        let rust_library = self.make_rust_library(platforms, &krate, target)?;
                         starlark.push(Starlark::RustLibrary(rust_library));
                     }
                     Rule::Binary(target) => {
                         load("@rules_rust//rust:defs.bzl", "rust_binary");
-                        let rust_binary = self.make_rust_binary(platforms, krate, target)?;
+                        let rust_binary = self.make_rust_binary(platforms, &krate, target)?;
                         starlark.push(Starlark::RustBinary(rust_binary));
                     }
                 }

crate_universe/src/utils/starlark.rs

@@ -35,6 +35,7 @@ pub(crate) enum Starlark {
     Filegroup(Filegroup),
     Alias(Alias),
     CargoBuildScript(CargoBuildScript),
+    CargoTomlEnvVars(CargoTomlEnvVars),
     #[serde(serialize_with = "serialize::rust_proc_macro")]
     RustProcMacro(RustProcMacro),
     #[serde(serialize_with = "serialize::rust_library")]
@@ -140,6 +141,13 @@ pub(crate) struct CargoBuildScript {
     pub(crate) visibility: Set<String>,
 }
 
+#[derive(Serialize)]
+#[serde(rename = "cargo_toml_env_vars")]
+pub(crate) struct CargoTomlEnvVars {
+    pub(crate) name: String,
+    pub(crate) src: String,
+}
+
 #[derive(Serialize)]
 pub(crate) struct RustProcMacro {
     pub(crate) name: String,

examples/crate_universe/cargo_local/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@crate_index_cargo_local//:defs.bzl", "aliases", "all_crate_deps")
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 
@@ -16,3 +17,11 @@ rust_test(
     proc_macro_deps = all_crate_deps(proc_macro_dev = True),
     deps = all_crate_deps(normal_dev = True),
 )
+
+build_test(
+    name = "cargo_toml_env_var_test",
+    targets = [
+        # This target would fail to build if cargo_toml_env_vars didn't properly populate $CARGO_PKG_REPOSITORY.
+        "@crate_index_cargo_local//:autometrics",
+    ],
+)