From f035220778554f9fef906403e3abdbb46c105fac Mon Sep 17 00:00:00 2001
From: motorailgun <28751910+motorailgun@users.noreply.github.com>
Date: Fri, 8 May 2026 09:10:09 +0000
Subject: [PATCH 1/2] chore(settings): add test to parse default_host_triple in
 toml

---
 src/settings.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/settings.rs b/src/settings.rs
index 15d7669fa0..f6fc0ba3c2 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -224,4 +224,16 @@ profile = "default"
 
 [overrides]
 "#;
+
+    #[test]
+    fn deserialize_default_host_triple() {
+        let raw = r#"version = "12"
+default_host_triple = "stable-aarch64-apple-darwin"
+"#;
+        let settings = Settings::parse(raw).unwrap();
+        assert_eq!(
+            settings.default_host_triple,
+            Some("stable-aarch64-apple-darwin".to_owned())
+        );
+    }
 }

From 02352d73e2a5cf858003daf9c7b737246204ecbf Mon Sep 17 00:00:00 2001
From: motorailgun <28751910+motorailgun@users.noreply.github.com>
Date: Fri, 8 May 2026 09:19:06 +0000
Subject: [PATCH 2/2] chore(settings): rename default_host_triple to
 default_host_tuple and alias old name

---
 src/config.rs   |  6 ++----
 src/settings.rs | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 59bb120312..a9991b9ad4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -913,9 +913,7 @@ impl<'a> Cfg<'a> {
         // if the supplied tuple is insufficient / bad.
         PartialToolchainDesc::from_str("stable")?.resolve(&TargetTuple::new(host_tuple.clone()))?;
         self.settings_file.with_mut(|s| {
-            // TODO: Support default_host_tuple in settings while keeping default_host_triple
-            // for backwards compatibility.
-            s.default_host_triple = Some(host_tuple);
+            s.default_host_tuple = Some(host_tuple);
             Ok(())
         })
     }
@@ -995,7 +993,7 @@ impl Debug for Cfg<'_> {
 }
 
 fn default_host_tuple(s: &Settings, process: &Process) -> TargetTuple {
-    s.default_host_triple
+    s.default_host_tuple
         .as_ref()
         .map(TargetTuple::new)
         .unwrap_or_else(|| TargetTuple::from_host_or_build(process))
diff --git a/src/settings.rs b/src/settings.rs
index f6fc0ba3c2..42dc7ceebf 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -82,7 +82,8 @@ impl SettingsFile {
 pub struct Settings {
     pub version: MetadataVersion,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_host_triple: Option<String>,
+    #[serde(alias = "default_host_triple")]
+    pub default_host_tuple: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub default_toolchain: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -232,7 +233,19 @@ default_host_triple = "stable-aarch64-apple-darwin"
 "#;
         let settings = Settings::parse(raw).unwrap();
         assert_eq!(
-            settings.default_host_triple,
+            settings.default_host_tuple,
+            Some("stable-aarch64-apple-darwin".to_owned())
+        );
+    }
+
+    #[test]
+    fn deserialize_default_host_tuple() {
+        let raw = r#"version = "12"
+default_host_tuple = "stable-aarch64-apple-darwin"
+"#;
+        let settings = Settings::parse(raw).unwrap();
+        assert_eq!(
+            settings.default_host_tuple,
             Some("stable-aarch64-apple-darwin".to_owned())
         );
     }