Move cargo_pgrx::env to cargo_pgrx::cargo (pgcentralfoundation#2186)

Separate to make the move easy to track relative to later diffs of
cargo-pgrx/src/cargo.rs

Author: workingjubilee

cargo-pgrx/src/env.rs cargo-pgrx/src/cargo.rscargo-pgrx/src/env.rs renamed to cargo-pgrx/src/cargo.rs

@@ -87,7 +87,7 @@ fn make_target_info(cmd: &PgrxTarget, tmp: &Path) -> Result<()> {
         );
     }
 
-    run(crate::env::cargo().args(["init", "--lib", "--name", "temp-crate"]).current_dir(tmp))?;
+    run(crate::cargo::cargo().args(["init", "--lib", "--name", "temp-crate"]).current_dir(tmp))?;
 
     let cargo_add: Vec<String> = if let Some(pg_sys_path) = &cmd.pg_sys_path {
         let abs = pg_sys_path.canonicalize().wrap_err_with(|| {
@@ -99,14 +99,14 @@ fn make_target_info(cmd: &PgrxTarget, tmp: &Path) -> Result<()> {
         vec![format!("pgrx-pg-sys@={own_version}")]
     };
 
-    run(crate::env::cargo()
+    run(crate::cargo::cargo()
         .arg("add")
         .args(cargo_add)
         .arg("--no-default-features")
         .current_dir(tmp))?;
 
     let filename = format!("pg{major_version}_raw_bindings.rs");
-    run(crate::env::cargo()
+    run(crate::cargo::cargo()
         .current_dir(tmp)
         .arg("build")
         .arg("--features")

cargo-pgrx/src/command/cross/pgrx_target.rs

@@ -289,7 +289,7 @@ pub(crate) fn build_extension(
 ) -> eyre::Result<std::process::Output> {
     let flags = std::env::var("PGRX_BUILD_FLAGS").unwrap_or_default();
 
-    let mut command = crate::env::cargo();
+    let mut command = crate::cargo::cargo();
     command.arg("build");
     command.arg("--lib");
 

cargo-pgrx/src/command/install.rs

@@ -333,7 +333,7 @@ fn first_build(
     target: Option<&str>,
     package_name: &str,
 ) -> eyre::Result<()> {
-    let mut command = crate::env::cargo();
+    let mut command = crate::cargo::cargo();
     command.stdin(Stdio::null());
     command.stdout(Stdio::null());
     command.stderr(Stdio::inherit());
@@ -500,7 +500,7 @@ fn second_build(
     package_name: &str,
     manifest: &Manifest,
 ) -> eyre::Result<()> {
-    let mut command = crate::env::cargo();
+    let mut command = crate::cargo::cargo();
     command.stdin(Stdio::null());
     command.stdout(Stdio::null());
     command.stderr(Stdio::inherit());

cargo-pgrx/src/command/schema.rs

@@ -139,7 +139,7 @@ pub fn test_extension(
     }
     let target_dir = get_target_dir()?;
 
-    let mut command = crate::env::cargo();
+    let mut command = crate::cargo::cargo();
 
     let no_default_features_arg = features.no_default_features;
     let mut features_arg = features.features.join(" ");

cargo-pgrx/src/command/test.rs

@@ -11,7 +11,7 @@ mod command;
 mod manifest;
 mod metadata;
 
-pub(crate) mod env;
+pub(crate) mod cargo;
 pub(crate) mod profile;
 
 use clap::Parser;
@@ -58,7 +58,7 @@ impl CommandExecute for CargoSubcommands {
 
 fn main() -> color_eyre::Result<()> {
     let stderr_is_tty = io::stderr().is_terminal();
-    env::initialize();
+    cargo::initialize();
     color_eyre::config::HookBuilder::default().theme(color_eyre::config::Theme::new()).install()?;
 
     let cargo_cli = CargoCommand::parse();