remove types and move the content to toml/common

Author: Shourya742

src/bootstrap/src/core/config/config.rs

@@ -26,13 +26,12 @@ use crate::core::config::flags::Color;
 pub use crate::core::config::flags::Subcommand;
 use crate::core::config::toml::change_id::ChangeId;
 use crate::core::config::toml::common::{
-    DebuginfoLevel, LlvmLibunwind, SplitDebuginfo, StringOrBool,
+    DebuginfoLevel, DryRun, GccCiMode, LlvmLibunwind, RustcLto, SplitDebuginfo, StringOrBool,
 };
 use crate::core::config::toml::rust::{
     LldMode, RustOptimize, check_incompatible_options_for_ci_rustc,
 };
 use crate::core::config::toml::target::Target;
-use crate::core::config::types::{DryRun, GccCiMode, RustcLto};
 use crate::core::download::is_download_ci_available;
 use crate::utils::channel;
 use crate::{Command, Flags, GitInfo, OnceLock, TargetSelection, helpers, output, t};

src/bootstrap/src/core/config/mod.rs

@@ -6,7 +6,6 @@ pub mod target_selection;
 #[cfg(test)]
 mod tests;
 pub mod toml;
-pub mod types;
 
 pub use config::*;
 pub use target_selection::TargetSelection;
@@ -15,4 +14,3 @@ pub use toml::change_id::ChangeId;
 pub use toml::common::*;
 pub use toml::rust::LldMode;
 pub use toml::target::Target;
-pub use types::*;

src/bootstrap/src/core/config/toml/common.rs

@@ -143,6 +143,52 @@ pub enum ReplaceOpt {
     ErrorOnDuplicate,
 }
 
+#[derive(Clone, Default)]
+pub enum DryRun {
+    /// This isn't a dry run.
+    #[default]
+    Disabled,
+    /// This is a dry run enabled by bootstrap itself, so it can verify that no work is done.
+    SelfCheck,
+    /// This is a dry run enabled by the `--dry-run` flag.
+    UserSelected,
+}
+
+/// LTO mode used for compiling rustc itself.
+#[derive(Default, Clone, PartialEq, Debug)]
+pub enum RustcLto {
+    Off,
+    #[default]
+    ThinLocal,
+    Thin,
+    Fat,
+}
+
+impl std::str::FromStr for RustcLto {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "thin-local" => Ok(RustcLto::ThinLocal),
+            "thin" => Ok(RustcLto::Thin),
+            "fat" => Ok(RustcLto::Fat),
+            "off" => Ok(RustcLto::Off),
+            _ => Err(format!("Invalid value for rustc LTO: {s}")),
+        }
+    }
+}
+
+/// Determines how will GCC be provided.
+#[derive(Default, Clone)]
+pub enum GccCiMode {
+    /// Build GCC from the local `src/gcc` submodule.
+    #[default]
+    BuildLocally,
+    /// Try to download GCC from CI.
+    /// If it is not available on CI, it will be built locally instead.
+    DownloadFromCi,
+}
+
 pub fn set<T>(field: &mut T, val: Option<T>) {
     if let Some(v) = val {
         *field = v;