fixup! rustc_target: introduce Os

Author: tamird

compiler/rustc_codegen_ssa/src/back/apple.rs

@@ -19,12 +19,12 @@ mod tests;
 pub(super) fn sdk_name(target: &Target) -> &'static str {
     match (&target.os, &target.env) {
         (Os::MacOs, Env::Unspecified) => "MacOSX",
-        (Os::Ios, Env::Unspecified) => "iPhoneOS",
-        (Os::Ios, Env::Sim) => "iPhoneSimulator",
+        (Os::IOs, Env::Unspecified) => "iPhoneOS",
+        (Os::IOs, Env::Sim) => "iPhoneSimulator",
         // Mac Catalyst uses the macOS SDK
-        (Os::Ios, Env::MacAbi) => "MacOSX",
-        (Os::Tvos, Env::Unspecified) => "AppleTVOS",
-        (Os::Tvos, Env::Sim) => "AppleTVSimulator",
+        (Os::IOs, Env::MacAbi) => "MacOSX",
+        (Os::TvOs, Env::Unspecified) => "AppleTVOS",
+        (Os::TvOs, Env::Sim) => "AppleTVSimulator",
         (Os::VisionOs, Env::Unspecified) => "XROS",
         (Os::VisionOs, Env::Sim) => "XRSimulator",
         (Os::WatchOs, Env::Unspecified) => "WatchOS",
@@ -36,13 +36,13 @@ pub(super) fn sdk_name(target: &Target) -> &'static str {
 pub(super) fn macho_platform(target: &Target) -> u32 {
     match (&target.os, &target.env) {
         (Os::MacOs, _) => object::macho::PLATFORM_MACOS,
-        (Os::Ios, Env::MacAbi) => object::macho::PLATFORM_MACCATALYST,
-        (Os::Ios, Env::Sim) => object::macho::PLATFORM_IOSSIMULATOR,
-        (Os::Ios, _) => object::macho::PLATFORM_IOS,
+        (Os::IOs, Env::MacAbi) => object::macho::PLATFORM_MACCATALYST,
+        (Os::IOs, Env::Sim) => object::macho::PLATFORM_IOSSIMULATOR,
+        (Os::IOs, _) => object::macho::PLATFORM_IOS,
         (Os::WatchOs, Env::Sim) => object::macho::PLATFORM_WATCHOSSIMULATOR,
         (Os::WatchOs, _) => object::macho::PLATFORM_WATCHOS,
-        (Os::Tvos, Env::Sim) => object::macho::PLATFORM_TVOSSIMULATOR,
-        (Os::Tvos, _) => object::macho::PLATFORM_TVOS,
+        (Os::TvOs, Env::Sim) => object::macho::PLATFORM_TVOSSIMULATOR,
+        (Os::TvOs, _) => object::macho::PLATFORM_TVOS,
         (Os::VisionOs, Env::Sim) => object::macho::PLATFORM_XROSSIMULATOR,
         (Os::VisionOs, _) => object::macho::PLATFORM_XROS,
         (os, env) => unreachable!("invalid os '{os}' / env '{env}' combination for Apple target"),

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -3125,9 +3125,9 @@ fn add_apple_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavo
         // > - driverkit
         let platform_name = match (target_os, target_env) {
             (os, Env::Unspecified) => os.desc(),
-            (Os::Ios, Env::MacAbi) => "mac-catalyst",
-            (Os::Ios, Env::Sim) => "ios-simulator",
-            (Os::Tvos, Env::Sim) => "tvos-simulator",
+            (Os::IOs, Env::MacAbi) => "mac-catalyst",
+            (Os::IOs, Env::Sim) => "ios-simulator",
+            (Os::TvOs, Env::Sim) => "tvos-simulator",
             (Os::WatchOs, Env::Sim) => "watchos-simulator",
             (Os::VisionOs, Env::Sim) => "visionos-simulator",
             _ => bug!("invalid OS/env combination for Apple target: {target_os}, {target_env}"),

compiler/rustc_target/src/spec/base/apple/mod.rs

@@ -212,9 +212,9 @@ fn unversioned_llvm_target(os: &Os, arch: Arch, env: TargetEnv) -> StaticCow<str
     // https://github.com/llvm/llvm-project/blob/llvmorg-18.1.8/llvm/lib/TargetParser/Triple.cpp#L236-L282
     let os = match os {
         Os::MacOs => "macosx",
-        Os::Ios => "ios",
+        Os::IOs => "ios",
         Os::WatchOs => "watchos",
-        Os::Tvos => "tvos",
+        Os::TvOs => "tvos",
         Os::VisionOs => "xros",
         _ => unreachable!("tried to get LLVM target OS for non-Apple platform"),
     };
@@ -304,8 +304,8 @@ impl OSVersion {
         // ```
         let (major, minor, patch) = match os {
             Os::MacOs => (10, 12, 0),
-            Os::Ios => (10, 0, 0),
-            Os::Tvos => (10, 0, 0),
+            Os::IOs => (10, 0, 0),
+            Os::TvOs => (10, 0, 0),
             Os::WatchOs => (5, 0, 0),
             Os::VisionOs => (1, 0, 0),
             other => {
@@ -325,12 +325,12 @@ impl OSVersion {
     pub fn minimum_deployment_target(target: &Target) -> Self {
         let (major, minor, patch) = match (&target.os, &target.arch, &target.env) {
             (Os::MacOs, crate::spec::Arch::AArch64, _) => (11, 0, 0),
-            (Os::Ios, crate::spec::Arch::AArch64, Env::MacAbi) => (14, 0, 0),
-            (Os::Ios, crate::spec::Arch::AArch64, Env::Sim) => (14, 0, 0),
-            (Os::Ios, _, _) if target.llvm_target.starts_with("arm64e") => (14, 0, 0),
+            (Os::IOs, crate::spec::Arch::AArch64, Env::MacAbi) => (14, 0, 0),
+            (Os::IOs, crate::spec::Arch::AArch64, Env::Sim) => (14, 0, 0),
+            (Os::IOs, _, _) if target.llvm_target.starts_with("arm64e") => (14, 0, 0),
             // Mac Catalyst defaults to 13.1 in Clang.
-            (Os::Ios, _, Env::MacAbi) => (13, 1, 0),
-            (Os::Tvos, crate::spec::Arch::AArch64, Env::Sim) => (14, 0, 0),
+            (Os::IOs, _, Env::MacAbi) => (13, 1, 0),
+            (Os::TvOs, crate::spec::Arch::AArch64, Env::Sim) => (14, 0, 0),
             (Os::WatchOs, crate::spec::Arch::AArch64, Env::Sim) => (7, 0, 0),
             // True Aarch64 on watchOS (instead of their Aarch64 Ilp32 called `arm64_32`) has been
             // available since Xcode 14, but it's only actually used more recently in watchOS 26.
@@ -349,9 +349,9 @@ impl OSVersion {
 pub fn deployment_target_env_var(os: &Os) -> &'static str {
     match os {
         Os::MacOs => "MACOSX_DEPLOYMENT_TARGET",
-        Os::Ios => "IPHONEOS_DEPLOYMENT_TARGET",
+        Os::IOs => "IPHONEOS_DEPLOYMENT_TARGET",
         Os::WatchOs => "WATCHOS_DEPLOYMENT_TARGET",
-        Os::Tvos => "TVOS_DEPLOYMENT_TARGET",
+        Os::TvOs => "TVOS_DEPLOYMENT_TARGET",
         Os::VisionOs => "XROS_DEPLOYMENT_TARGET",
         _ => unreachable!("tried to get deployment target env var for non-Apple platform"),
     }

compiler/rustc_target/src/spec/mod.rs

@@ -1948,6 +1948,7 @@ crate::target_spec_enum! {
         Horizon = "horizon",
         Hurd = "hurd",
         Illumos = "illumos",
+        IOs = "ios",
         L4Re = "l4re",
         Linux = "linux",
         LynxOs178 = "lynxos178",
@@ -1957,17 +1958,17 @@ crate::target_spec_enum! {
         NetBsd = "netbsd",
         None = "none",
         Nto = "nto",
-        Nuttx = "nuttx",
+        NuttX = "nuttx",
         OpenBsd = "openbsd",
-        Psx = "psx",
         Psp = "psp",
+        Psx = "psx",
         Redox = "redox",
         Rtems = "rtems",
         Solaris = "solaris",
         SolidAsp3 = "solid_asp3",
         TeeOs = "teeos",
         Trusty = "trusty",
-        Tvos = "tvos",
+        TvOs = "tvos",
         Uefi = "uefi",
         VexOs = "vexos",
         VisionOs = "visionos",
@@ -1978,7 +1979,6 @@ crate::target_spec_enum! {
         Windows = "windows",
         Xous = "xous",
         Zkvm = "zkvm",
-        Ios = "ios",
         Unknown = "unknown",
     }
     /// The vast majority of the time, the compiler deals with a fixed set of

compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

@@ -2,7 +2,7 @@ use crate::spec::base::apple::{Arch, TargetEnv, base};
 use crate::spec::{Os, SanitizerSet, Target, TargetMetadata, TargetOptions};
 
 pub(crate) fn target() -> Target {
-    let (opts, llvm_target, arch) = base(Os::Ios, Arch::Arm64, TargetEnv::Normal);
+    let (opts, llvm_target, arch) = base(Os::IOs, Arch::Arm64, TargetEnv::Normal);
     Target {
         llvm_target,
         metadata: TargetMetadata {

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

@@ -2,7 +2,7 @@ use crate::spec::base::apple::{Arch, TargetEnv, base};
 use crate::spec::{Os, SanitizerSet, Target, TargetMetadata, TargetOptions};
 
 pub(crate) fn target() -> Target {
-    let (opts, llvm_target, arch) = base(Os::Ios, Arch::Arm64, TargetEnv::MacCatalyst);
+    let (opts, llvm_target, arch) = base(Os::IOs, Arch::Arm64, TargetEnv::MacCatalyst);
     Target {
         llvm_target,
         metadata: TargetMetadata {

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

@@ -2,7 +2,7 @@ use crate::spec::base::apple::{Arch, TargetEnv, base};
 use crate::spec::{Os, SanitizerSet, Target, TargetMetadata, TargetOptions};
 
 pub(crate) fn target() -> Target {
-    let (opts, llvm_target, arch) = base(Os::Ios, Arch::Arm64, TargetEnv::Simulator);
+    let (opts, llvm_target, arch) = base(Os::IOs, Arch::Arm64, TargetEnv::Simulator);
     Target {
         llvm_target,
         metadata: TargetMetadata {

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

@@ -2,7 +2,7 @@ use crate::spec::base::apple::{Arch, TargetEnv, base};
 use crate::spec::{Os, Target, TargetMetadata, TargetOptions};
 
 pub(crate) fn target() -> Target {
-    let (opts, llvm_target, arch) = base(Os::Tvos, Arch::Arm64, TargetEnv::Normal);
+    let (opts, llvm_target, arch) = base(Os::TvOs, Arch::Arm64, TargetEnv::Normal);
     Target {
         llvm_target,
         metadata: TargetMetadata {

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

@@ -2,7 +2,7 @@ use crate::spec::base::apple::{Arch, TargetEnv, base};
 use crate::spec::{Os, Target, TargetMetadata, TargetOptions};
 
 pub(crate) fn target() -> Target {
-    let (opts, llvm_target, arch) = base(Os::Tvos, Arch::Arm64, TargetEnv::Simulator);
+    let (opts, llvm_target, arch) = base(Os::TvOs, Arch::Arm64, TargetEnv::Simulator);
     Target {
         llvm_target,
         metadata: TargetMetadata {

compiler/rustc_target/src/spec/targets/aarch64_unknown_nuttx.rs

@@ -28,7 +28,7 @@ pub(crate) fn target() -> Target {
         stack_probes: StackProbeType::Inline,
         panic_strategy: PanicStrategy::Abort,
         families: cvs!["unix"],
-        os: Os::Nuttx,
+        os: Os::NuttX,
         ..Default::default()
     };
     Target {