Move CargoProfile into cargo_pgrx::cargo (pgcentralfoundation#2188)

Consolidates cargo-command-building code in its now-obvious home.

Author: workingjubilee

cargo-pgrx/src/cargo.rs

@@ -7,7 +7,6 @@
 //LICENSE All rights reserved.
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
-use crate::profile::CargoProfile;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 use std::{env, process};
@@ -213,3 +212,52 @@ pub(crate) fn initialize() {
         (_, Err(_)) => {}
     }
 }
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub enum CargoProfile {
+    /// The default non-release profile, `[profile.dev]`
+    #[default]
+    Dev,
+    /// The default release profile, `[profile.release]`
+    Release,
+    /// Some other profile, specified by name.
+    Profile(String),
+}
+
+impl CargoProfile {
+    pub fn from_flags(profile: Option<&str>, default: CargoProfile) -> eyre::Result<Self> {
+        match profile {
+            // Cargo treats `--profile release` the same as `--release`.
+            Some("release") => Ok(Self::Release),
+            // Cargo has two names for the debug profile, due to legacy
+            // reasons...
+            Some("debug") | Some("dev") => Ok(Self::Dev),
+            Some(profile) => Ok(Self::Profile(profile.into())),
+            None => Ok(default),
+        }
+    }
+
+    pub fn cargo_args(&self) -> Vec<String> {
+        match self {
+            Self::Dev => vec![],
+            Self::Release => vec!["--release".into()],
+            Self::Profile(p) => vec!["--profile".into(), p.into()],
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        match self {
+            Self::Dev => "dev",
+            Self::Release => "release",
+            Self::Profile(p) => p,
+        }
+    }
+
+    pub fn target_subdir(&self) -> &str {
+        match self {
+            Self::Dev => "debug",
+            Self::Release => "release",
+            Self::Profile(p) => p,
+        }
+    }
+}

cargo-pgrx/src/command/install.rs

@@ -8,10 +8,10 @@
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use crate::CommandExecute;
+use crate::cargo::CargoProfile;
 use crate::command::get::{find_control_file, get_property};
 use crate::command::sudo_install::SudoInstall;
 use crate::manifest::{PgVersionSource, display_version_info};
-use crate::profile::CargoProfile;
 use cargo_metadata::Message as CargoMessage;
 use cargo_toml::Manifest;
 use eyre::{WrapErr, eyre};

cargo-pgrx/src/command/package.rs

@@ -8,9 +8,10 @@
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use crate::CommandExecute;
+use crate::cargo::CargoProfile;
+use crate::command::get::get_property;
 use crate::command::install::install_extension;
 use crate::manifest::{PgVersionSource, display_version_info};
-use crate::{command::get::get_property, profile::CargoProfile};
 use cargo_toml::Manifest;
 use eyre::{WrapErr, eyre};
 use pgrx_pg_config::{PgConfig, Pgrx, get_target_dir};

cargo-pgrx/src/command/run.rs

@@ -9,13 +9,13 @@ use std::collections::HashMap;
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use crate::CommandExecute;
+use crate::cargo::CargoProfile;
 use crate::command::get::get_property;
 use crate::command::install::install_extension;
 use crate::command::regress::Regress;
 use crate::command::start::start_postgres;
 use crate::command::stop::stop_postgres;
 use crate::manifest::{get_package_manifest, pg_config_and_version};
-use crate::profile::CargoProfile;
 use eyre::eyre;
 use owo_colors::OwoColorize;
 use pgrx_pg_config::{PgConfig, Pgrx, createdb};

cargo-pgrx/src/command/schema.rs

@@ -8,10 +8,9 @@
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use crate::CommandExecute;
-use crate::cargo::{self, Cargo};
+use crate::cargo::{self, Cargo, CargoProfile};
 use crate::command::get::{find_control_file, get_property};
 use crate::manifest::{get_package_manifest, pg_config_and_version};
-use crate::profile::CargoProfile;
 use cargo_toml::Manifest;
 use eyre::{WrapErr, eyre};
 use object::read::macho::MachOFatFile32;

cargo-pgrx/src/command/test.rs

@@ -13,8 +13,8 @@ use std::path::{Path, PathBuf};
 use std::process::Stdio;
 
 use crate::CommandExecute;
+use crate::cargo::CargoProfile;
 use crate::manifest::{get_package_manifest, pg_config_and_version};
-use crate::profile::CargoProfile;
 
 /// Run the test suite for this crate
 #[derive(clap::Args, Debug, Clone)]

cargo-pgrx/src/main.rs

@@ -12,7 +12,6 @@ mod manifest;
 mod metadata;
 
 pub(crate) mod cargo;
-pub(crate) mod profile;
 
 use clap::Parser;
 use std::io::{self, IsTerminal};